Changeset 6eef5ef

Timestamp:

03/21/2006 11:25:40 PM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

experimental

Children:

d591ee5

Parents:

68809ca

Message:

CLFS, manipulation of BOOT_CONFIG in CLFS/master.sh and common/func_validate_configs.sh

Files:

• CLFS/master.sh (modified) (1 diff)
• common/func_validate_configs.sh (modified) (2 diffs)

CLFS/master.sh

@@ -220 +220 @@
                 [[ -z $CONFIG ]] && continue
                   # Copy the config file to /sources with a standardized name
-                cp $CONFIG $BUILDDIR/sources/kernel-config
-                sed "s|make mrproper|make mrproper\ncp /sources/kernel-config .config|" -i $file
+                cp $BOOT_CONFIG $BUILDDIR/sources/bootkernel-config
+                sed "s|make mrproper|make mrproper\ncp /sources/bootkernel-config .config|" -i $file
                   # You cannot run menuconfig from within the makefile
                 sed 's|menuconfig|oldconfig|'     -i $file

common/func_validate_configs.sh

@@ -117 +117 @@
 
 
-    for config_param in FSTAB CONFIG BOOK; do
+    for config_param in FSTAB BOOK CONFIG; do
       [[ $1 = "1" ]] && echo "`eval echo $PARAM_VALS`"
       if [[ $config_param = BOOK ]]; then
@@ -128 +128 @@
       write_error_and_die
     done
-      echo "   ${BOLD}${GREEN}${PARAM_GROUP%%_*T} specific parameters are valid${OFF}"
+
+    [[ "$PROGNAME" = "clfs" ]] &&
+    for config_param in BOOT_CONFIG; do
+      if [[ "${METHOD}" = "boot" ]]; then
+        [[ $1 = "1" ]] && echo "`eval echo $PARAM_VALS`"
+          # There must be a config file when the build method is 'boot'
+        [[ -e "${!config_param}" ]] && [[ -s "${!config_param}" ]] && continue
+          # If you make it this far then there is a problem
+        write_error_and_die
+      fi
+    done
+    echo "   ${BOLD}${GREEN}${PARAM_GROUP%%_*T} specific parameters are valid${OFF}"
   done
+
   set -e
   echo "$tab_***${BOLD}${GREEN}Config parameters look good${OFF}***"