Remove anaconda syslogd mode, use a syslogd command instead.

4 files changed, 13 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 25d48bd4a..ccbe924f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-01  Chris Lumens  <clumens@redhat.com>
+
+	* anaconda:  Remove syslogd mode.
+	* syslogd.py:  Use syslogd command, not anaconda.
+	* scripts/upd-instroot:  Add syslogd-stub.
+
 2006-04-27  Chris Lumens  <clumens@redhat.com>
 
 	* partitions.py (Partitions.writeKS):  Emit --useexisting and --noformat
diff --git a/anaconda b/anaconda
index b25adb176..709f14a19 100755
--- a/anaconda
+++ b/anaconda
@@ -365,17 +365,6 @@ stdoutLog = logging.getLogger("anaconda.stdout")
 # pull this in to get product name and versioning
 import product
 
-# do this early to keep our import footprint as small as possible
-# Python passed my path as argv[0]!
-# if sys.argv[0][-7:] == "syslogd":
-if len(sys.argv) > 1:
-    if sys.argv[1] == "--syslogd":
-	from syslogd import Syslogd
-	root = sys.argv[2]
-	output = sys.argv[3]
-	syslog = Syslogd (root, open (output, "a"))
-	# this never returns
-
 # this handles setting up RHupdates for pypackages to minimize the set needed
 setupPythonUpdates()
 
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 05b9d8d13..3b7dd78dc 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -1070,6 +1070,8 @@ EOF
 echo "Creating libuser.conf"
 cat > $DEST/etc/libuser.conf <<EOF
 [defaults]
+skeleton = /mnt/sysimage/etc/skel
+mailspooldir = /mnt/sysimage/var/mail
 crypt_style = md5
 modules = files shadow
 create_modules = files shadow
@@ -1172,6 +1174,7 @@ for p in $DEST $DESTGR; do
 	cp $p/usr/lib/anaconda/kudzu-probe-stub $p/usr/bin/kudzu-probe
 	cp $p/usr/lib/anaconda/loadkeys-stub $p/usr/bin/loadkeys
 	cp $p/usr/lib/anaconda/mknod-stub $p/usr/bin/mknod
+	cp $p/usr/lib/anaconda/syslogd-stub $p/usr/bin/syslogd
 	mv $p/usr/sbin/anaconda $p/usr/bin/anaconda
 	mv $p/usr/lib/anaconda-runtime/lib* $p/usr/$LIBDIR
 
diff --git a/syslogd.py b/syslogd.py
index 5d4a01954..cde46400d 100644
--- a/syslogd.py
+++ b/syslogd.py
@@ -67,22 +67,14 @@ class InstSyslog:
         self.pid = os.fork ()
         if not self.pid:
             # look on PYTHONPATH first, so we use updated anaconda
-            path = None
+            path = "/usr/bin/syslogd"
             if os.environ.has_key('PYTHONPATH'):
                 for f in string.split(os.environ['PYTHONPATH'], ":"):
-                    if os.access (f+"/anaconda", os.X_OK):
-                        path = f+"/anaconda"
+                    if os.access (f+"/syslogd", os.X_OK):
+                        path = f+"/syslogd"
                         break
                 
-            if not path:
-                if os.access ("./anaconda", os.X_OK):
-                    path = "./anaconda"
-                elif os.access ("/usr/bin/anaconda.real", os.X_OK):
-                    path = "/usr/bin/anaconda.real"
-                else:
-                    path = "/usr/bin/anaconda"
-                    
-            os.execv (path, ("syslogd", "--syslogd", root, log))
+            os.execv (path, ("syslogd", root, log))
 
     def stop(self):
         if self.pid == -1: