From e602f05814db85c107490153efdf7ef7c51a8c58 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Fri, 6 Jan 2012 04:23:14 +0000 Subject: [PATCH] Fix some defaults otherwise you get an initramfs without any modules! Signed-off-by: Robin H. Johnson --- ChangeLog | 4 ++++ gen_determineargs.sh | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 817e1b7..36a6026 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ # Distributed under the GPL v2 # $Id$ + 06 Jan 2012; Robin H. Johnson gen_determineargs.sh, + genkernel.conf: + Fix some defaults otherwise you get an initramfs without any modules! + 06 Jan 2012; Robin H. Johnson defaults/busy-config: Awk support in busybox is needed for initramfs setup code (to parse fstab). diff --git a/gen_determineargs.sh b/gen_determineargs.sh index b68f048..cd91a27 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -72,7 +72,7 @@ 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 MAKEOPTS CMD_MAKEOPTS "$DEFAULT_MAKEOPTS" @@ -98,8 +98,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 @@ -128,7 +128,7 @@ 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 "no" BOOTDIR=`arch_replace "${BOOTDIR}"` BOOTDIR=${BOOTDIR%/} # Remove any trailing slash