Make e2fsprogs optional (and off by default)

cleanup-cruft
Rick Farina 12 years ago committed by Sebastian Pipping
parent c9a61ce2c7
commit 255c8e8498

@ -263,6 +263,9 @@ INITIALIZATION
*--*[*no-*]*dmraid*:: *--*[*no-*]*dmraid*::
Includes or excludes DMRAID support. Includes or excludes DMRAID support.
*--*[*no-*]*e2fsprogs*::
Includes or excludes e2fsprogs.
*--*[*no-*]*zfs*:: *--*[*no-*]*zfs*::
Includes or excludes ZFS support. Includes or excludes ZFS support.

@ -91,6 +91,8 @@ longusage() {
echo " --mdadm-config=<file> Use file as mdadm.conf in initramfs" echo " --mdadm-config=<file> Use file as mdadm.conf in initramfs"
echo " --dmraid Include DMRAID support" echo " --dmraid Include DMRAID support"
echo " --no-dmraid Exclude DMRAID support" echo " --no-dmraid Exclude DMRAID support"
echo " --e2fsprogs Include e2fsprogs"
echo " --no-e2fsprogs Exclude e2fsprogs"
echo " --zfs Include ZFS support" echo " --zfs Include ZFS support"
echo " --no-zfs Exclude ZFS support" echo " --no-zfs Exclude ZFS support"
echo " --multipath Include Multipath support" echo " --multipath Include Multipath support"
@ -306,6 +308,10 @@ parse_cmdline() {
fi fi
print_info 2 "CMD_DMRAID: ${CMD_DMRAID}" print_info 2 "CMD_DMRAID: ${CMD_DMRAID}"
;; ;;
--e2fsprogs|--no-e2fsprogs)
CMD_E2FSPROGS=`parse_optbool "$*"`
print_info 2 "CMD_E2FSPROGS: ${CMD_E2FSPROGS}"
;;
--zfs|--no-zfs) --zfs|--no-zfs)
CMD_ZFS=`parse_optbool "$*"` CMD_ZFS=`parse_optbool "$*"`
print_info 2 "CMD_ZFS: ${CMD_ZFS}" print_info 2 "CMD_ZFS: ${CMD_ZFS}"

@ -122,6 +122,7 @@ determine_real_args() {
set_config_with_override BOOL GPG CMD_GPG set_config_with_override BOOL GPG CMD_GPG
set_config_with_override BOOL MDADM CMD_MDADM set_config_with_override BOOL MDADM CMD_MDADM
set_config_with_override STRING MDADM_CONFIG CMD_MDADM_CONFIG 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 ZFS CMD_ZFS
set_config_with_override BOOL MULTIPATH CMD_MULTIPATH set_config_with_override BOOL MULTIPATH CMD_MULTIPATH
set_config_with_override BOOL FIRMWARE CMD_FIRMWARE set_config_with_override BOOL FIRMWARE CMD_FIRMWARE

@ -127,7 +127,7 @@ append_busybox() {
rm -rf "${TEMP}/initramfs-busybox-temp" > /dev/null rm -rf "${TEMP}/initramfs-busybox-temp" > /dev/null
} }
append_e2fstools(){ append_e2fsprogs(){
if [ -d "${TEMP}"/initramfs-e2fsprogs-temp ] if [ -d "${TEMP}"/initramfs-e2fsprogs-temp ]
then then
rm -r "${TEMP}"/initramfs-e2fsprogs-temp rm -r "${TEMP}"/initramfs-e2fsprogs-temp
@ -758,7 +758,7 @@ create_initramfs() {
append_data 'base_layout' append_data 'base_layout'
append_data 'auxilary' "${BUSYBOX}" append_data 'auxilary' "${BUSYBOX}"
append_data 'busybox' "${BUSYBOX}" append_data 'busybox' "${BUSYBOX}"
append_data 'e2fstools' isTrue "${CMD_E2FSPROGS}" && append_data 'e2fsprogs'
append_data 'lvm' "${LVM}" append_data 'lvm' "${LVM}"
append_data 'dmraid' "${DMRAID}" append_data 'dmraid' "${DMRAID}"
append_data 'iscsi' "${ISCSI}" append_data 'iscsi' "${ISCSI}"

@ -87,6 +87,9 @@ USECOLOR="yes"
# Add iSCSI support. # Add iSCSI support.
#ISCSI="no" #ISCSI="no"
# Add e2fsprogs support.
#E2FSPROGS="no"
# Include support for unionfs # Include support for unionfs
#UNIONFS="1" #UNIONFS="1"

Loading…
Cancel
Save