Author: pierre
Date: Thu May 8 08:51:53 2014
New Revision: 3793
Log:
Adaptation to the new layout for CLFS systemd.
>From a patch by W. Harrington
Modified:
jhalfs/trunk/CLFS/master.sh
Modified: jhalfs/trunk/CLFS/master.sh
==============================================================================
--- jhalfs/trunk/CLFS/master.sh Wed May 7 08:30:33 2014 (r3792)
+++ jhalfs/trunk/CLFS/master.sh Thu May 8 08:51:53 2014 (r3793)
@@ -358,6 +358,7 @@
case $this_script in
*kernel) name=linux ;;
*bootscripts) name="bootscripts-cross-lfs" ;;
+ *boot-scripts) name="boot-scripts-cross-lfs" ;;
*udev-rules) name="udev-cross-lfs" ;;
*grub-build) name=grub ;;
*-aboot-build) name=aboot ;;
@@ -605,13 +606,22 @@
bootscripts_Makefiles() { #
#--------------------------------------#
+# New versions of the book do not have bootscripts anymore
+# (use systemd configuration files)
+# Define a variable to be used for the right script directory to parse
+ if [ -d bootscripts ]; then
+ config="bootscripts"
+ else
+ config="system-config"
+ fi
+
if [[ "${METHOD}" = "chroot" ]]; then
- echo "${tab_}${GREEN}Processing... ${L_arrow}(chroot) bootscripts (
CHROOT ) ${R_arrow}"
+ echo "${tab_}${GREEN}Processing... ${L_arrow}(chroot) $config ( CHROOT )
${R_arrow}"
else
- echo "${tab_}${GREEN}Processing... ${L_arrow}(boot) bootscripts ( ROOT
) ${R_arrow}"
+ echo "${tab_}${GREEN}Processing... ${L_arrow}(boot) $config ( ROOT )
${R_arrow}"
fi
- for file in bootscripts/* ; do
+ for file in $config/* ; do
# Keep the script file name
this_script=`basename $file`
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
