From: Andrew Gaffney Date: Wed, 24 Dec 2008 18:47:55 +0000 (-0600) Subject: Add --busybox-config= commandline option X-Git-Tag: v3.4.10.903~4 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bee96914eb9061bc2a20e2b949775c7633c7bdf9;p=genkernel.git Add --busybox-config= commandline option --- diff --git a/ChangeLog b/ChangeLog index 1686d93..0657c4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney # Distributed under the GPL v2 + 24 Dec 2008; Andrew Gaffney gen_cmdline.sh, + gen_determineargs.sh: + Add --busybox-config= commandline option + 24 Dec 2008; Andrew Gaffney netboot/linuxrc.x: Revert to just running /bin/bash on /dev/console for serial. We still start getty on tty2-6 diff --git a/gen_cmdline.sh b/gen_cmdline.sh index dadf740..a1ca537 100755 --- a/gen_cmdline.sh +++ b/gen_cmdline.sh @@ -86,6 +86,7 @@ longusage() { echo " --slowusb Enables extra pauses for slow USB CD boots" echo " --bootloader=grub Add new kernel to GRUB configuration" echo " --linuxrc= Specifies a user created linuxrc" + echo " --busybox-config= Specifies a user created busybox config" echo " --disklabel Include disk label and uuid support in your" echo " ramdisk" echo " --luks Include LUKS support" @@ -483,6 +484,10 @@ parse_cmdline() { CMD_LINUXRC=`parse_opt "$*"` print_info 2 "CMD_LINUXRC: ${CMD_LINUXRC}" ;; + --busybox-config=*) + CMD_BUSYBOX_CONFIG=`parse_opt "$*"` + print_info 2 "CMD_BUSYBOX_CONFIG: ${CMD_BUSYBOX_CONFIG}" + ;; --genzimage) KERNEL_MAKE_DIRECTIVE_2='zImage.initrd' KERNEL_BINARY_2='arch/powerpc/boot/zImage.initrd' diff --git a/gen_determineargs.sh b/gen_determineargs.sh index aea05f2..4b6cfe4 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -116,6 +116,7 @@ determine_real_args() { set_config_with_override 1 GENZIMAGE CMD_GENZIMAGE set_config_with_override 1 KEYMAP CMD_KEYMAP "yes" set_config_with_override 1 DOKEYMAPAUTO CMD_DOKEYMAPAUTO + set_config_with_override 2 BUSYBOX_CONFIG CMD_BUSYBOX_CONFIG BOOTDIR=`arch_replace "${BOOTDIR}"` BOOTDIR=${BOOTDIR%/} # Remove any trailing slash