diff options
| author |   Rick Farina <sidhayn@gmail.com> | 2012-09-30 21:17:30 +0200 |
|---|---|---|
| committer |   Sebastian Pipping <sebastian@pipping.org> | 2012-09-30 21:27:25 +0200 |
| commit | 255c8e84983d5b0285651828938117ba1676802d (patch) | |
| tree | a7feeecbdb76117a7a3e59ec2f8915b8b2777ae4 | |
| parent | Append e2fsck and mke2fs to initramfs (diff) | |
| download | genkernel-255c8e84983d5b0285651828938117ba1676802d.tar.gz genkernel-255c8e84983d5b0285651828938117ba1676802d.tar.bz2 genkernel-255c8e84983d5b0285651828938117ba1676802d.zip | |
Make e2fsprogs optional (and off by default)
| -rw-r--r-- | doc/genkernel.8.txt | 3 | ||||
| -rwxr-xr-x | gen_cmdline.sh | 6 | ||||
| -rwxr-xr-x | gen_determineargs.sh | 1 | ||||
| -rwxr-xr-x | gen_initramfs.sh | 4 | ||||
| -rw-r--r-- | genkernel.conf | 3 |
5 files changed, 15 insertions, 2 deletions
diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt index 9a96f32c..912f899f 100644 --- 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 938b1a5f..a3052018 100755 --- 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 7f352f8f..92a6458a 100755 --- 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 ee21d2f9..9d070f58 100755 --- 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 5d93a66b..af73931e 100644 --- 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" |