zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

HLFS: Fixed SUDO target.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2006-12-08 12:21:02 +00:00
parent 85077e7f77
commit 24f2c511ce
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
HLFS/master.sh
View file

@ -318,7 +318,10 @@ chapter6_Makefiles() { # sysroot or chroot build phase
# Append each name of the script files to a list (this will become # Append each name of the script files to a list (this will become
# the names of the targets in the Makefile # 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,8 +337,11 @@ chapter6_Makefiles() { # sysroot or chroot build phase
PREV=$this_script PREV=$this_script
continue continue
fi fi
# kernfs and changingowner are run in SUDO target
CHROOT_wrt_target "${this_script}" "$PREV" case "${this_script}" in
*kernfs* | *changingowner*) LUSER_wrt_target "${this_script}" "$PREV" ;;
*) CHROOT_wrt_target "${this_script}" "$PREV" ;;
esac
# If $pkg_tarball isn't empty, we've got a package... # If $pkg_tarball isn't empty, we've got a package...
# Insert instructions for unpacking the package and changing directories # Insert instructions for unpacking the package and changing directories
@ -353,14 +359,10 @@ chapter6_Makefiles() { # sysroot or chroot build phase
[[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name" [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name"
fi 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 case "${this_script}" in
*kernfs* | *changingowner*) *kernfs* | *changingowner*) wrt_RunAsRoot "${file}" ;;
wrt_RunAsRoot "${file}" *) CHROOT_wrt_RunAsRoot "${file}" ;;
;;
*) # The rest of Chapter06
CHROOT_wrt_RunAsRoot "${file}"
;;
esac esac
# #
# Remove the build directory(ies) except if the package build fails. # Remove the build directory(ies) except if the package build fails.
@ -572,7 +574,7 @@ mk_BLFS_TOOL: create-sbu_du-report
SETUP: $chapter3 SETUP: $chapter3
LUSER: $chapter5 LUSER: $chapter5
SUDO: 060-kernfs 062-changingowner SUDO: $runasroot
CHROOT: $chapter6 CHROOT: $chapter6
BOOT: $chapter7 BOOT: $chapter7
BLFS_TOOL: $blfs_tool BLFS_TOOL: $blfs_tool