Bug #351873: More livecd control, and initramfs livecd argument documentation.

[genkernel.git] / gen_determineargs.sh

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index e6ed0a3cdbb1ff388f120c915bb7ef5e2f86cb5c..eb822b30aa2dda2bbb90b113c339f0e75a64c5a1 100755 (executable)
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -76,6 +76,7 @@ determine_real_args() {
        set_config_with_override STRING KNAME                CMD_KERNNAME             "genkernel"
 
        set_config_with_override STRING COMPRESS_INITRD      CMD_COMPRESS_INITRD      "$DEFAULT_COMPRESS_INITRD"
+       set_config_with_override STRING COMPRESS_INITRD_TYPE CMD_COMPRESS_INITRD_TYPE "$DEFAULT_COMPRESS_INITRD_TYPE"
        set_config_with_override STRING MAKEOPTS             CMD_MAKEOPTS             "$DEFAULT_MAKEOPTS"
        set_config_with_override STRING KERNEL_MAKE          CMD_KERNEL_MAKE          "$DEFAULT_KERNEL_MAKE"
        set_config_with_override STRING UTILS_MAKE           CMD_UTILS_MAKE           "$DEFAULT_UTILS_MAKE"
@@ -89,6 +90,8 @@ determine_real_args() {
        set_config_with_override STRING KERNEL_CROSS_COMPILE CMD_KERNEL_CROSS_COMPILE
        set_config_with_override STRING UTILS_CROSS_COMPILE  CMD_UTILS_CROSS_COMPILE
        set_config_with_override STRING BOOTDIR              CMD_BOOTDIR              "/boot"
+       set_config_with_override STRING KERNEL_OUTPUTDIR     CMD_KERNEL_OUTPUTDIR     "${DEFAULT_KERNEL_SOURCE}"
+       set_config_with_override STRING MODPROBEDIR          CMD_MODPROBEDIR          "/etc/modprobe.d"
 
        set_config_with_override BOOL   SPLASH               CMD_SPLASH
        set_config_with_override BOOL   POSTCLEAR            CMD_POSTCLEAR
@@ -120,6 +123,7 @@ determine_real_args() {
        set_config_with_override BOOL   GPG                  CMD_GPG
        set_config_with_override BOOL   MDADM                CMD_MDADM
        set_config_with_override STRING MDADM_CONFIG         CMD_MDADM_CONFIG
+       set_config_with_override BOOL   E2FSPROGS            CMD_E2FSPROGS            "no"
        set_config_with_override BOOL   ZFS                  CMD_ZFS
        set_config_with_override BOOL   MULTIPATH            CMD_MULTIPATH
        set_config_with_override BOOL   FIRMWARE             CMD_FIRMWARE
@@ -134,10 +138,10 @@ determine_real_args() {
 
        BOOTDIR=`arch_replace "${BOOTDIR}"`
        BOOTDIR=${BOOTDIR%/}    # Remove any trailing slash
+       MODPROBEDIR=${MODPROBEDIR%/}    # Remove any trailing slash
 
        CACHE_DIR=`arch_replace "${CACHE_DIR}"`
        BUSYBOX_BINCACHE=`cache_replace "${BUSYBOX_BINCACHE}"`
-       DEVICE_MAPPER_BINCACHE=`cache_replace "${DEVICE_MAPPER_BINCACHE}"`
        LVM_BINCACHE=`cache_replace "${LVM_BINCACHE}"`
        MDADM_BINCACHE=`cache_replace "${MDADM_BINCACHE}"`
        DMRAID_BINCACHE=`cache_replace "${DMRAID_BINCACHE}"`
@@ -150,7 +154,6 @@ determine_real_args() {
        DEFAULT_KERNEL_CONFIG=`arch_replace "${DEFAULT_KERNEL_CONFIG}"`
        BUSYBOX_CONFIG=`arch_replace "${BUSYBOX_CONFIG}"`
        BUSYBOX_BINCACHE=`arch_replace "${BUSYBOX_BINCACHE}"`
-       DEVICE_MAPPER_BINCACHE=`arch_replace "${DEVICE_MAPPER_BINCACHE}"`
        LVM_BINCACHE=`arch_replace "${LVM_BINCACHE}"`
        MDADM_BINCACHE=`arch_replace "${MDADM_BINCACHE}"`
        DMRAID_BINCACHE=`arch_replace "${DMRAID_BINCACHE}"`