kadischi/post_install_scripts 02install.sh, 1.17, 1.18 04userconfig.pl, 1.4, 1.5 06sysconfig.py, 1.8, 1.9

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

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

Modified Files:
	02install.sh 04userconfig.pl 06sysconfig.py 
Log Message:
Minor fixes


Index: 02install.sh
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/02install.sh,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- 02install.sh	22 Apr 2007 18:51:10 -0000	1.17
+++ 02install.sh	4 May 2007 10:50:40 -0000	1.18
@@ -16,6 +16,7 @@
 inst rc.readonly-livecd etc/rc.d/
 inst readonly-halt etc/init.d/
 inst readonly-root etc/sysconfig/
+inst rc.local etc/rc.d/
 cp $LIBEXECDIR/kadischi/scanswap $DSTDIR/usr/sbin/
 cp $LIBEXECDIR/kadischi/eject-live-cd $DSTDIR/sbin/
 


Index: 04userconfig.pl
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/04userconfig.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 04userconfig.pl	16 Apr 2007 15:30:36 -0000	1.4
+++ 04userconfig.pl	4 May 2007 10:50:40 -0000	1.5
@@ -67,6 +67,18 @@
                 system("for i in $RETURN\ do /usr/sbin/chroot $SYSDIR /sbin/chkconfig --level 5 \$i on; done");
                 
             }
+            else {
+                $LOKKIT = "$SYSDIR/usr/sbin/lokkit";
+                $NTSYSV = "$SYSDIR/usr/sbin/ntsysv";
+
+                if (-e $LOKKIT) {
+                    system("/usr/sbin/chroot $SYSDIR /usr/sbin/lokkit");
+                }
+
+                if (-e $NTSYSV) {
+                    system("/usr/sbin/chroot $SYSDIR /usr/sbin/ntsysv --level 35");
+                }
+            }
         }        
         else {              
             $LOKKIT = "$SYSDIR/usr/sbin/lokkit";


Index: 06sysconfig.py
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/06sysconfig.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- 06sysconfig.py	25 Apr 2007 23:33:28 -0000	1.8
+++ 06sysconfig.py	4 May 2007 10:50:40 -0000	1.9
@@ -50,16 +50,6 @@
     shf["KUDZU_ARGS"] =  "-q"
     shf.write ()
 
-def tweak_livecd (rootdir):
-    stampfile = (rootdir + '/../.buildstamp')
-    if os.access(stampfile, os.R_OK):
-        shutil.copy(stampfile, rootdir + '/.livecd')
-    else:
-        shutil.copy("/etc/kadischi/buildstamp", rootdir + '/.livecd')
-    ### Use buildstamp file rather than an empty file
-    # file = open (normalize_path (['.livecd'], rootdir) , 'w')
-    # file.close()
-
 rootdir = sys.argv[1]
 
 tweak_readonly_root_config (rootdir)
@@ -67,4 +57,3 @@
 tweak_firstboot_config (rootdir)
 tweak_network_config (rootdir)
 #tweak_kudzu_config (rootdir)
-tweak_livecd (rootdir)