kadischi/post_install_scripts 01prelink.sh, 1.3, 1.4 04userconfig.py, 1.6, 1.7

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

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

Modified Files:
	01prelink.sh 04userconfig.py 
Log Message:
Allow building using sudo or su from user accounts


Index: 01prelink.sh
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/01prelink.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 01prelink.sh	17 May 2006 19:10:22 -0000	1.3
+++ 01prelink.sh	22 May 2006 05:36:38 -0000	1.4
@@ -8,9 +8,9 @@
 
 if [ -f $CHROOTDIR/etc/prelink.conf ]; then
    echo "Prelinking.. "
-   chroot $CHROOTDIR /bin/mount -t proc /proc /proc || sleep 1
-   chroot $CHROOTDIR /usr/sbin/prelink --all >/dev/null 2>&1
-   chroot $CHROOTDIR /bin/umount /proc || sleep 1
+   /usr/sbin/chroot $CHROOTDIR /bin/mount -t proc /proc /proc || sleep 1
+   /usr/sbin/chroot $CHROOTDIR /usr/sbin/prelink --all >/dev/null 2>&1
+   /usr/sbin/chroot $CHROOTDIR /bin/umount /proc || sleep 1
    exit 0
 else
    echo "No prelink.conf found.. won't prelink."


Index: 04userconfig.py
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/04userconfig.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 04userconfig.py	20 Apr 2006 16:12:36 -0000	1.6
+++ 04userconfig.py	22 May 2006 05:36:38 -0000	1.7
@@ -16,7 +16,7 @@
 ntsysv = os.path.isfile(os.path.join(sysdir, "usr/sbin/ntsysv"))
 
 
-run("chroot %s %s" % (sysdir, "/usr/sbin/authconfig --kickstart --nostart --enableshadow --enablemd5 --disablecache --disablenis --disableldap --disableldapauth --disableldaptls --disablekrb5 --disablehesiod --disablesmbauth"))
+run("/usr/sbin/chroot %s %s" % (sysdir, "/usr/sbin/authconfig --kickstart --nostart --enableshadow --enablemd5 --disablecache --disablenis --disableldap --disableldapauth --disableldaptls --disablekrb5 --disablehesiod --disablesmbauth"))
 
 if anaconda_args != []:
     for args in anaconda_args:
@@ -26,24 +26,24 @@
 
     if lokkit:
         flc_log("Taking you to interactive firewalling configuration..")
-        run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
+        run("/usr/sbin/chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
     else:
         flc_log("lokkit can't be found, skipping firewalling configuration..")
 
     if ntsysv:
         flc_log("Taking you to interactive services configuration..")
-        run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv --level 35"))
+        run("/usr/sbin/chroot %s %s" % (sysdir, "/usr/sbin/ntsysv --level 35"))
     else:
         flc_log("ntsysv can't be found, skipping services configuration..")
 else:
     if lokkit:
         flc_log("Taking you to interactive firewalling configuration..")
-        run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
+        run("/usr/sbin/chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
     else:
         flc_log("lokkit can't be found, skipping firewalling configuration..")
 
     if ntsysv:
         flc_log("Taking you to interactive services configuration..")
-        run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv --level 35"))
+        run("/usr/sbin/chroot %s %s" % (sysdir, "/usr/sbin/ntsysv --level 35"))
     else:
         flc_log("ntsysv can't be found, skipping interactive services configuration..")