Changeset c6ee8ea

Timestamp:

05/08/2014 03:51:53 PM (10 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

c4ad7bf

Parents:

719d0fc

Message:

Adaptation to the new layout for CLFS systemd.
From a patch by W. Harrington

File:

• CLFS/master.sh (modified) (2 diffs)

CLFS/master.sh

@@ -359 +359 @@
       *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                    ;;
@@ -606 +607 @@
 #--------------------------------------#
 
+# 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`