Make e2fsprogs optional (and off by default)

diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 9a96f32c9ca39ab08192b86f21cd8e72fd8702b9..912f899fc0ca3c2a14babb8c9a326a4e4cb0bf54 100644 (file)
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -263,6 +263,9 @@ INITIALIZATION
 *--*[*no-*]*dmraid*::
     Includes or excludes DMRAID support.
 
+*--*[*no-*]*e2fsprogs*::
+    Includes or excludes e2fsprogs.
+
 *--*[*no-*]*zfs*::
     Includes or excludes ZFS support.
 

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 938b1a5f7ddda356f9f0b1f2e13f5261038f20ff..a30520189e2f86a78a3ef04449e8319880a204c6 100755 (executable)
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -91,6 +91,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"
@@ -306,6 +308,10 @@ parse_cmdline() {
                        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}"

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 7f352f8ff4d92c9ced40009b73ffb5e0e5f9c256..92a6458a452aa24d9cb737b2d7c2372da45ab663 100755 (executable)
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -122,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   E2FSPROGS            CMD_E2FSPROGS            "no"
        set_config_with_override BOOL   ZFS                  CMD_ZFS
        set_config_with_override BOOL   MULTIPATH            CMD_MULTIPATH
        set_config_with_override BOOL   FIRMWARE             CMD_FIRMWARE

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index ee21d2f908212dbe4f28e16d26eab1bf3effe065..9d070f58dfe817b1571204411ea55a37531554d7 100755 (executable)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -127,7 +127,7 @@ append_busybox() {
        rm -rf "${TEMP}/initramfs-busybox-temp" > /dev/null
 }
 
-append_e2fstools(){
+append_e2fsprogs(){
        if [ -d "${TEMP}"/initramfs-e2fsprogs-temp ]
        then
                rm -r "${TEMP}"/initramfs-e2fsprogs-temp
@@ -758,7 +758,7 @@ create_initramfs() {
        append_data 'base_layout'
        append_data 'auxilary' "${BUSYBOX}"
        append_data 'busybox' "${BUSYBOX}"
-       append_data 'e2fstools'
+       isTrue "${CMD_E2FSPROGS}" && append_data 'e2fsprogs'
        append_data 'lvm' "${LVM}"
        append_data 'dmraid' "${DMRAID}"
        append_data 'iscsi' "${ISCSI}"

diff --git a/genkernel.conf b/genkernel.conf
index 5d93a66b389305451b56274d2d40cc26ad9b8be3..af73931e6a20e6aa85ca1c53701887fb9e2ee576 100644 (file)
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -87,6 +87,9 @@ USECOLOR="yes"
 # Add iSCSI support.
 #ISCSI="no"
 
+# Add e2fsprogs support.
+#E2FSPROGS="no"
+
 # Include support for unionfs
 #UNIONFS="1"