kadischi/post_install_scripts 04userconfig.py, 1.4, 1.5 05fsclean.py, 1.3, 1.4 Makefile.am, 1.3, 1.4

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

Update of /cvs/devel/kadischi/post_install_scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7323/kadischi/post_install_scripts

Modified Files:
	04userconfig.py 05fsclean.py Makefile.am 
Log Message:
Few minor changes. Additional user account creation post_install_script.


Index: 04userconfig.py
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/04userconfig.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 04userconfig.py	12 Apr 2006 23:12:10 -0000	1.4
+++ 04userconfig.py	18 Apr 2006 00:20:42 -0000	1.5
@@ -27,13 +27,13 @@
     if (lokkit and ntsysv) == True:
         flc_log("Taking you to interactive user configuration..")
         run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
-        run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
+        run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv --level 35"))
     else:
         flc_log("Skipping interactive user configuration..")
 else:
     if (lokkit and ntsysv) == True:
         flc_log("Taking you to interactive user configuration..")
         run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
-        run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
+        run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv --level 35"))
     else:
         flc_log("Skipping interactive user configuration..")


Index: 05fsclean.py
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/05fsclean.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 05fsclean.py	31 Mar 2006 21:03:41 -0000	1.3
+++ 05fsclean.py	18 Apr 2006 00:20:42 -0000	1.4
@@ -7,7 +7,7 @@
 
 # Directories that we want to empty but not delete
 directories_to_be_emptied = [
-    '/root',
+#   '/root',  root's files should stay.
     '/proc',
     '/lost+found',
     '/var/gdm',
@@ -49,10 +49,10 @@
             continue
         os.remove (path)
 
-def clean_up_root (rootdir):
+#def clean_up_root (rootdir):
     # FIXME: Do this nicer at some point
-    os.system ("chroot %s /usr/bin/rsync -a /etc/skel/ /root/" % rootdir)
-    os.chmod (rootdir + '/root', 0750)
+#    os.system ("chroot %s /usr/bin/rsync -a /etc/skel/ /root/" % rootdir)
+#    os.chmod (rootdir + '/root', 0750)
 
 rootdir = sys.argv[1]
 
@@ -61,4 +61,4 @@
         directories_to_be_emptied,
         directories_to_be_cleaned,
         files_to_be_removed)
-clean_up_root (rootdir)
+#clean_up_root (rootdir)


Index: Makefile.am
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am	10 Apr 2006 22:53:32 -0000	1.3
+++ Makefile.am	18 Apr 2006 00:20:42 -0000	1.4
@@ -1,5 +1,5 @@
 PYTHON_FILES = 03fstab.py 04userconfig.py 05fsclean.py 06sysconfig.py
-BASH_FILES = 01prelink.sh 02install.sh
+BASH_FILES = 01prelink.sh 02install.sh 07accounts.sh
 
 pisdir = $(pkgdatadir)/post_install_scripts
 pis_SCRIPTS = $(PYTHON_FILES) $(BASH_FILES)