Make root_trim work with crypt_root_key

[genkernel.git] / gen_determineargs.sh

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index b68f04820966d9de30dc1bd50563fdab418b30f5..7f352f8ff4d92c9ced40009b73ffb5e0e5f9c256 100755 (executable)
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -72,9 +72,11 @@ determine_real_args() {
        #                               ------------------   ------------             ------------
        set_config_with_override STRING LOGFILE              CMD_LOGFILE
        set_config_with_override STRING KERNEL_DIR           CMD_KERNEL_DIR           "${DEFAULT_KERNEL_SOURCE}"
-       set_config_with_override BOOL   KERNEL_SOURCES           CMD_KERNEL_SOURCES
+       set_config_with_override BOOL   KERNEL_SOURCES       CMD_KERNEL_SOURCES       "yes"
        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"
@@ -88,6 +90,7 @@ 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 MODPROBEDIR          CMD_MODPROBEDIR          "/etc/modprobe.d"
 
        set_config_with_override BOOL   SPLASH               CMD_SPLASH
        set_config_with_override BOOL   POSTCLEAR            CMD_POSTCLEAR
@@ -98,8 +101,8 @@ determine_real_args() {
        set_config_with_override STRING MINKERNPACKAGE       CMD_MINKERNPACKAGE
        set_config_with_override STRING MODULESPACKAGE       CMD_MODULESPACKAGE
        set_config_with_override STRING KERNCACHE            CMD_KERNCACHE
-       set_config_with_override BOOL   RAMDISKMODULES       CMD_RAMDISKMODULES
-       set_config_with_override BOOL   ALLRAMDISKMODULES    CMD_ALLRAMDISKMODULES
+       set_config_with_override BOOL   RAMDISKMODULES       CMD_RAMDISKMODULES        "yes"
+       set_config_with_override BOOL   ALLRAMDISKMODULES    CMD_ALLRAMDISKMODULES     "no"
        set_config_with_override STRING INITRAMFS_OVERLAY    CMD_INITRAMFS_OVERLAY
        set_config_with_override BOOL   MOUNTBOOT            CMD_MOUNTBOOT
        set_config_with_override BOOL   BUILD_STATIC         CMD_STATIC
@@ -119,6 +122,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   ZFS                  CMD_ZFS
        set_config_with_override BOOL   MULTIPATH            CMD_MULTIPATH
        set_config_with_override BOOL   FIRMWARE             CMD_FIRMWARE
        set_config_with_override STRING FIRMWARE_DIR         CMD_FIRMWARE_DIR         "/lib/firmware"
@@ -128,14 +132,14 @@ determine_real_args() {
        set_config_with_override BOOL   KEYMAP               CMD_KEYMAP               "yes"
        set_config_with_override BOOL   DOKEYMAPAUTO         CMD_DOKEYMAPAUTO
        set_config_with_override STRING BUSYBOX_CONFIG       CMD_BUSYBOX_CONFIG
-       set_config_with_override BOOL   INSTALL              CMD_INSTALL
+       set_config_with_override BOOL   INSTALL              CMD_INSTALL              "yes"
 
        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}"`
@@ -148,7 +152,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}"`