Add --busybox-config= commandline option

diff --git a/ChangeLog b/ChangeLog
index 1686d93ac165718bd9f16ac5e0c269df6d6ade55..0657c4d3574fa5bbb1cbc7d4190a12c589735b10 100644 (file)
--- 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 <agaffney@gentoo.org> gen_cmdline.sh,
+  gen_determineargs.sh:
+  Add --busybox-config= commandline option
+
   24 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> 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 dadf7404850c44f595dd2d6eb7901cbb9328a51b..a1ca53780525619e0f3d20e5da077a6639908aa3 100755 (executable)
--- 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=<file>        Specifies a user created linuxrc"
+  echo "       --busybox-config=<file> 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 aea05f2533a2fecd6c96ce89a6c1816ff7ec624b..4b6cfe438d33248f210afd1ed35f84a203483c70 100755 (executable)
--- 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