Small correction to CLFS master.sh, bring it in line with the book.

Added to README.
This commit is contained in:
George Boudreau 2006-07-03 17:42:30 +00:00
parent bb19ced081
commit ac1d897a7a
3 changed files with 23 additions and 3 deletions

View file

@ -340,9 +340,9 @@ chroot_Makefiles() { #
# #
# Select a script execution method # Select a script execution method
case $this_script in case $this_script in
*kernfs) wrt_run_as_root "${this_script}" "${file}" ;; *kernfs) wrt_run_as_clfs_root "${this_script}" "${file}" ;;
*util-linux) wrt_run_as_su "${this_script}" "${file}" ;; *util-linux) wrt_run_as_su "${this_script}" "${file}" ;;
*) wrt_run_as_chroot1 "${this_script}" "${file}" ;; *) wrt_run_as_chroot1 "${this_script}" "${file}" ;;
esac esac
# #
# Housekeeping...remove the build directory(ies), except if the package build fails. # Housekeeping...remove the build directory(ies), except if the package build fails.

6
README
View file

@ -135,6 +135,12 @@ $Id$
6. FAQ:: 6. FAQ::
Q. "It doesn't work!" Q. "It doesn't work!"
A. Yes it does, try ./lfs --help 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?" Q. "How do I specify the build location?"
A. The original LFS document worked against the well know location /mnt/lfs. A. The original LFS document worked against the well know location /mnt/lfs.

View file

@ -380,6 +380,20 @@ EOF
} }
#----------------------------------#
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() { # wrt_run_as_root2() { #
#----------------------------------# #----------------------------------#