r2814 - in jhalfs/trunk: . CLFS common

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Mon Jul 3 10:42:30 PDT 2006


Author: georgeb
Date: 2006-07-03 11:42:30 -0600 (Mon, 03 Jul 2006)
New Revision: 2814

Modified:
   jhalfs/trunk/CLFS/master.sh
   jhalfs/trunk/README
   jhalfs/trunk/common/common-functions
Log:
Small correction to CLFS master.sh, bring it in line with the book.
 Added to README.

Modified: jhalfs/trunk/CLFS/master.sh
===================================================================
--- jhalfs/trunk/CLFS/master.sh	2006-07-03 17:21:21 UTC (rev 2813)
+++ jhalfs/trunk/CLFS/master.sh	2006-07-03 17:42:30 UTC (rev 2814)
@@ -340,9 +340,9 @@
     #
     # Select a script execution method
     case $this_script in
-      *kernfs)        wrt_run_as_root    "${this_script}" "${file}"  ;;
-      *util-linux)    wrt_run_as_su      "${this_script}" "${file}"  ;;
-      *)              wrt_run_as_chroot1 "${this_script}" "${file}"  ;;
+      *kernfs)        wrt_run_as_clfs_root "${this_script}" "${file}"  ;;
+      *util-linux)    wrt_run_as_su        "${this_script}" "${file}"  ;;
+      *)              wrt_run_as_chroot1   "${this_script}" "${file}"  ;;
     esac
     #
     # Housekeeping...remove the build directory(ies), except if the package build fails.

Modified: jhalfs/trunk/README
===================================================================
--- jhalfs/trunk/README	2006-07-03 17:21:21 UTC (rev 2813)
+++ jhalfs/trunk/README	2006-07-03 17:42:30 UTC (rev 2814)
@@ -135,6 +135,12 @@
 6. FAQ::
     Q. "It doesn't work!"
     A. Yes it does, try ./lfs --help
+    
+    Q. "It still doesn't work"
+    A. jhalfs was designed to work against the developement versions of the LFS
+       series of books. Consequently changes in a book(s) sometimes breaks older
+       versions of jhalfs. Before you start pulling out your hair download the
+       latest version of jhalfs is see it that solves your problem.
 
     Q. "How do I specify the build location?"
     A. The original LFS document worked against the well know location /mnt/lfs.

Modified: jhalfs/trunk/common/common-functions
===================================================================
--- jhalfs/trunk/common/common-functions	2006-07-03 17:21:21 UTC (rev 2813)
+++ jhalfs/trunk/common/common-functions	2006-07-03 17:42:30 UTC (rev 2814)
@@ -381,6 +381,20 @@
 
 
 #----------------------------------#
+wrt_run_as_clfs_root() {           # Some scripts must be run as root..
+#----------------------------------#
+  local this_script=$1
+  local file=$2
+(
+cat << EOF
+	@( time { export CLFS=\$(MOUNT_PT) && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
+	echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/$this_script
+EOF
+) >> $MKFILE.tmp
+}
+
+
+#----------------------------------#
 wrt_run_as_root2() {               #
 #----------------------------------#
   local this_script=$1




More information about the alfs-log mailing list