r3248 - jhalfs/trunk/LFS

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Mon Dec 4 03:49:52 PST 2006


Author: manuel
Date: 2006-12-04 04:49:51 -0700 (Mon, 04 Dec 2006)
New Revision: 3248

Modified:
   jhalfs/trunk/LFS/master.sh
Log:
LFS bug fix: Removed kernfs script from CHROOT target dependencies.
Avoided hardcoded SUDO target dependencies.

Modified: jhalfs/trunk/LFS/master.sh
===================================================================
--- jhalfs/trunk/LFS/master.sh	2006-12-04 11:26:39 UTC (rev 3247)
+++ jhalfs/trunk/LFS/master.sh	2006-12-04 11:49:51 UTC (rev 3248)
@@ -95,11 +95,11 @@
 
     # First append each name of the script files to a list (this will become
     # the names of the targets in the Makefile
-    # DO NOT append the changingowner script.
+    # DO NOT append the changingowner script, it need be run as root.
     # A hack is necessary: create script in chap5 BUT run as a dependency for
-    #  chap6 CHROOT
+    # SUDO target
     case "${this_script}" in
-      *changingowner) : ;;
+      *changingowner) runasroot="$runasroot ${this_script}" ;;
                    *) chapter5="$chapter5 ${this_script}" ;;
     esac
 
@@ -196,7 +196,7 @@
       *stripping*) [[ "${STRIP}" = "n" ]] && continue ;;
     esac
 
-    # Grab the name of the target
+    # Grab the name of the target.
     name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@'`
 
     # Find the version of the command files, if it corresponds with the building of
@@ -213,7 +213,11 @@
 
     # 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}${N}"
+    # The kernfs script must be run as part of SUDO target.
+    case "${this_script}" in
+      *kernfs) runasroot="$runasroot ${this_script}" ;;
+            *) chapter6="$chapter6 ${this_script}${N}" ;;
+    esac
 
     # Append each name of the script files to a list (this will become
     # the names of the logs to be moved for each iteration)
@@ -470,7 +474,7 @@
 
 SETUP:     $chapter4
 LUSER:     $chapter5
-SUDO:      057-changingowner 059-kernfs
+SUDO:      $runasroot
 CHROOT:    $chapter6
 BOOT:      $chapter789
 BLFS_TOOL: $blfs_tool




More information about the alfs-log mailing list