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

Adaptation to the new layout for CLFS systemd.

Browse source 
From a patch by W. Harrington
This commit is contained in:
Pierre Labastie 2014-05-08 15:51:53 +00:00
parent 719d0fc0a3
commit c6ee8eacba
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
CLFS/master.sh
View file

@ -358,6 +358,7 @@ boot_Makefiles() { #
case $this_script in case $this_script in
*kernel) name=linux ;; *kernel) name=linux ;;
*bootscripts) name="bootscripts-cross-lfs" ;; *bootscripts) name="bootscripts-cross-lfs" ;;
*boot-scripts) name="boot-scripts-cross-lfs" ;;
*udev-rules) name="udev-cross-lfs" ;; *udev-rules) name="udev-cross-lfs" ;;
*grub-build) name=grub ;; *grub-build) name=grub ;;
*-aboot-build) name=aboot ;; *-aboot-build) name=aboot ;;
@ -605,13 +606,22 @@ final_system_Makefiles() { #
bootscripts_Makefiles() { # bootscripts_Makefiles() { #
#--------------------------------------# #--------------------------------------#
if [[ "${METHOD}" = "chroot" ]]; then # New versions of the book do not have bootscripts anymore
echo "${tab_}${GREEN}Processing... ${L_arrow}(chroot) bootscripts ( CHROOT ) ${R_arrow}" # (use systemd configuration files)
# Define a variable to be used for the right script directory to parse
if [ -d bootscripts ]; then
config="bootscripts"
else else
echo "${tab_}${GREEN}Processing... ${L_arrow}(boot) bootscripts ( ROOT ) ${R_arrow}" config="system-config"
fi fi
for file in bootscripts/* ; do if [[ "${METHOD}" = "chroot" ]]; then
echo "${tab_}${GREEN}Processing... ${L_arrow}(chroot) $config ( CHROOT ) ${R_arrow}"
else
echo "${tab_}${GREEN}Processing... ${L_arrow}(boot) $config ( ROOT ) ${R_arrow}"
fi
for file in $config/* ; do
# Keep the script file name # Keep the script file name
this_script=`basename $file` this_script=`basename $file`