r3266 - jhalfs/trunk/HLFS

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Fri Dec 8 04:21:03 PST 2006


Author: manuel
Date: 2006-12-08 05:21:02 -0700 (Fri, 08 Dec 2006)
New Revision: 3266

Modified:
   jhalfs/trunk/HLFS/master.sh
Log:
HLFS: Fixed SUDO target.

Modified: jhalfs/trunk/HLFS/master.sh
===================================================================
--- jhalfs/trunk/HLFS/master.sh	2006-12-08 12:03:08 UTC (rev 3265)
+++ jhalfs/trunk/HLFS/master.sh	2006-12-08 12:21:02 UTC (rev 3266)
@@ -318,7 +318,10 @@
 
     # Append each name of the script files to a list (this will become
     # the names of the targets in the Makefile
-    chapter6="$chapter6 ${this_script}"
+    case "${this_script}" in
+      *kernfs* | *changingowner*) runasroot="$runasroot ${this_script}" ;;
+                               *) chapter6="$chapter6 ${this_script}" ;;
+    esac
 
 
     #--------------------------------------------------------------------#
@@ -334,9 +337,12 @@
        PREV=$this_script
        continue
     fi
+    # kernfs and changingowner are run in SUDO target
+    case "${this_script}" in
+      *kernfs* | *changingowner*)  LUSER_wrt_target  "${this_script}" "$PREV" ;;
+                               *)  CHROOT_wrt_target "${this_script}" "$PREV" ;;
+    esac
 
-    CHROOT_wrt_target "${this_script}" "$PREV"
-
     # If $pkg_tarball isn't empty, we've got a package...
     # Insert instructions for unpacking the package and changing directories
     if [ "$pkg_tarball" != "" ] ; then
@@ -353,14 +359,10 @@
       [[ "$OPTIMIZE" != "0" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
     fi
 
-    # In the mount of kernel filesystems we need to set HLFS and not to use chroot.
+    # In kernfs and changingowner we need to set HLFS and not to use chroot.
     case "${this_script}" in
-      *kernfs* | *changingowner*)
-        wrt_RunAsRoot "${file}"
-        ;;
-      *)   # The rest of Chapter06
-        CHROOT_wrt_RunAsRoot "${file}"
-       ;;
+      *kernfs* | *changingowner*) wrt_RunAsRoot "${file}" ;;
+                               *) CHROOT_wrt_RunAsRoot "${file}" ;;
     esac
     #
     # Remove the build directory(ies) except if the package build fails.
@@ -572,7 +574,7 @@
 
 SETUP:     $chapter3
 LUSER:     $chapter5
-SUDO:      060-kernfs 062-changingowner
+SUDO:      $runasroot
 CHROOT:    $chapter6
 BOOT:      $chapter7
 BLFS_TOOL: $blfs_tool




More information about the alfs-log mailing list