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

[genkernel.git] / gen_cmdline.sh

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 2e688823cb9318185ff56f313dc08e29bd6e210c..858b850d3a77472468904e80b2626efc12648308 100755 (executable)
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -63,6 +63,7 @@ longusage() {
   echo "       --kernel-make=<makeprg> GNU Make to use for kernel"
   echo "       --kernel-target=<t>     Override default make target (bzImage)"
   echo "       --kernel-binary=<path>  Override default kernel binary path (arch/foo/boot/bar)"
+  echo "       --kernel-outputdir=<path> Save output files outside the source tree."
 
   echo "       --utils-cc=<compiler>   Compiler to use for utilities"
   echo "       --utils-as=<assembler>  Assembler to use for utils"
@@ -75,6 +76,7 @@ longusage() {
   echo "       --mountboot             Mount BOOTDIR automatically if mountable"
   echo "       --no-mountboot          Don't mount BOOTDIR automatically"  
   echo "       --bootdir=<dir>         Set the location of the boot-directory, default is /boot"
+  echo "       --modprobedir=<dir>     Set the location of the modprobe.d-directory, default is /etc/modprobe.d"
   echo "  Initialization"
   echo "       --splash=<theme>        Enable framebuffer splash using <theme>"
   echo "       --splash-res=<res>      Select splash theme resolutions to install"
@@ -90,6 +92,8 @@ longusage() {
   echo "       --mdadm-config=<file>   Use file as mdadm.conf in initramfs"
   echo "       --dmraid                Include DMRAID support"
   echo "       --no-dmraid             Exclude DMRAID support"
+  echo "       --e2fsprogs             Include e2fsprogs"
+  echo "       --no-e2fsprogs          Exclude e2fsprogs"
   echo "       --zfs                   Include ZFS support"
   echo "       --no-zfs                Exclude ZFS support"
   echo "       --multipath             Include Multipath support"
@@ -211,6 +215,10 @@ parse_cmdline() {
                        CMD_KERNEL_CROSS_COMPILE=$(echo ${CMD_KERNEL_CROSS_COMPILE}|sed -e 's/.*[^-]$/&-/g')
                        print_info 2 "CMD_KERNEL_CROSS_COMPILE: ${CMD_KERNEL_CROSS_COMPILE}"
                        ;;
+               --kernel-outputdir=*)
+                       CMD_KERNEL_OUTPUTDIR=`parse_opt "$*"`
+                       print_info 2 "CMD_KERNEL_OUTPUTDIR: ${CMD_KERNEL_OUTPUTDIR}"
+                       ;;
                --utils-cc=*)
                        CMD_UTILS_CC=`parse_opt "$*"`
                        print_info 2 "CMD_UTILS_CC: ${CMD_UTILS_CC}"
@@ -248,6 +256,10 @@ parse_cmdline() {
                        CMD_BOOTDIR=`parse_opt "$*"`
                        print_info 2 "CMD_BOOTDIR: ${CMD_BOOTDIR}"
                        ;;
+               --modprobedir=*)
+                       CMD_MODPROBEDIR=`parse_opt "$*"`
+                       print_info 2 "CMD_MODPROBEDIR: ${CMD_MODPROBEDIR}"
+                       ;;
                --do-keymap-auto)
                        CMD_DOKEYMAPAUTO=1
                        CMD_KEYMAP=1
@@ -295,12 +307,16 @@ parse_cmdline() {
                        CMD_DMRAID=`parse_optbool "$*"`
                        if [ "$CMD_DMRAID" = "1" -a ! -e /usr/include/libdevmapper.h ]
                        then
-                               echo 'Error: --dmraid requires device-mapper to be installed'
-                               echo '           on the host system; try "emerge device-mapper".'
+                               echo 'Error: --dmraid requires LVM2 to be installed'
+                               echo '           on the host system; try "emerge lvm2".'
                                exit 1
                        fi
                        print_info 2 "CMD_DMRAID: ${CMD_DMRAID}"
                        ;;
+               --e2fsprogs|--no-e2fsprogs)
+                       CMD_E2FSPROGS=`parse_optbool "$*"`
+                       print_info 2 "CMD_E2FSPROGS: ${CMD_E2FSPROGS}"
+                       ;;
                --zfs|--no-zfs)
                        CMD_ZFS=`parse_optbool "$*"`
                        print_info 2 "CMD_ZFS: ${CMD_ZFS}"
@@ -309,8 +325,8 @@ parse_cmdline() {
                        CMD_MULTIPATH=`parse_optbool "$*"`
                        if [ "$CMD_MULTIPATH" = "1" -a ! -e /usr/include/libdevmapper.h ]
                        then
-                               echo 'Error: --multipath requires device-mapper to be installed'
-                               echo '           on the host;system; try "emerge device-mapper".'
+                               echo 'Error: --multipath requires LVM2 to be installed'
+                               echo '           on the host;system; try "emerge lvm2".'
                                exit 1
                        fi
                        print_info 2 "CMD_MULTIPATH: ${CMD_MULTIPATH}"