Extract variable _MODULES_LOAD to resolve duplication and later re-use

[genkernel.git] / genkernel

diff --git a/genkernel b/genkernel
index 5fe79bfcb69a67e81e3589d50a176825607bbefe..b31444069248f2b695bc9abb66e0d4658d168eb9 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.31'
+GK_V='3.4.40'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.
@@ -102,7 +102,8 @@ get_official_arch
 
 # Read arch-specific config
 source ${ARCH_CONFIG} || gen_die "Could not read ${ARCH_CONFIG}"
-source ${GK_SHARE}/arch/${ARCH}/modules_load || gen_die "Could not read ${GK_SHARE}/arch/${ARCH}/modules_load"
+_MODULES_LOAD=${GK_SHARE}/arch/${ARCH}/modules_load
+source "${_MODULES_LOAD}" || gen_die "Could not read ${_MODULES_LOAD}"
 
 # Merge modules_load from config
 for group_modules in ${!AMODULES_*}; do
@@ -117,6 +118,7 @@ done
 # get the real arguments for usage...
 
 determine_real_args
+determine_config_file
 
 set_kernel_arch
 
@@ -129,6 +131,7 @@ check_distfiles
 dump_debugcache
 
 NORMAL=${BOLD} print_info 1 "Linux Kernel ${BOLD}${KV}${NORMAL} for ${BOLD}${ARCH}${NORMAL}..."
+print_info 1 ".. with config file ${KERNEL_CONFIG}"
 
 # Check BOOTDIR is mounted
 if ! isTrue ${CMD_INSTALL}
@@ -279,8 +282,6 @@ fi
 
 if [ "${BUILD_RAMDISK}" = '1' ]
 then
-       [ "${DISKLABEL}" = '1' ] && compile_e2fsprogs
-
        if [ "${BUSYBOX}" = '1' ]
        then
                # Compile Busybox
@@ -354,10 +355,20 @@ then
        [ "${ZFS}" = '1' ] && print_warning 1 'add "dozfs" for ZFS volume management support'
        [ "${ZFS}" = '1' ] && print_warning 1 'add either "real_root=ZFS" (bootfs autodetection) or "real_root=ZFS=<dataset>" to boot from a ZFS dataset'
        [ "${ISCSI}" = '1' ] && print_warning 1 'add at least "iscsi_initiatorname=<initiator name> iscsi_target=<target name> and iscsi_address=<target ip>" for iscsi support'
-       if [ `grep 'CONFIG_EXT[0-9]_FS=' "${KERNEL_DIR}"/.config | wc -l` -ge 2 ]; then
-               print_warning 1 'With support for several ext* filesystems around it may be needed to'
-               print_warning 1 'add "rootfstype=ext3" or "rootfstype=ext4"'
+
+       if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]; then
+               # Support --kernel-config=/proc/config.gz, mainly
+               CONFGREP=zgrep
+       else
+               CONFGREP=grep
        fi
+
+       if [ `${CONFGREP} 'CONFIG_EXT[0-9]_FS=' "${KERNEL_CONFIG}" | wc -l` -ge 2 ]; then
+               print_warning 1 'With support for several ext* filesystems available, it may be needed to'
+               print_warning 1 'add "rootfstype=ext3" or "rootfstype=ext4" to the list of boot parameters.'
+       fi
+
+       unset CONFGREP
 fi
 
 [ "${BOOTRW}" != '' ] && mount -o remount,ro ${BOOTDIR}