| 1 |
commit: 255c8e84983d5b0285651828938117ba1676802d |
| 2 |
Author: Rick Farina <sidhayn <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Sep 30 19:17:30 2012 +0000 |
| 4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 30 19:27:25 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=255c8e84 |
| 7 |
|
| 8 |
Make e2fsprogs optional (and off by default) |
| 9 |
|
| 10 |
--- |
| 11 |
doc/genkernel.8.txt | 3 +++ |
| 12 |
gen_cmdline.sh | 6 ++++++ |
| 13 |
gen_determineargs.sh | 1 + |
| 14 |
gen_initramfs.sh | 4 ++-- |
| 15 |
genkernel.conf | 3 +++ |
| 16 |
5 files changed, 15 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt |
| 19 |
index 9a96f32..912f899 100644 |
| 20 |
--- a/doc/genkernel.8.txt |
| 21 |
+++ b/doc/genkernel.8.txt |
| 22 |
@@ -263,6 +263,9 @@ INITIALIZATION |
| 23 |
*--*[*no-*]*dmraid*:: |
| 24 |
Includes or excludes DMRAID support. |
| 25 |
|
| 26 |
+*--*[*no-*]*e2fsprogs*:: |
| 27 |
+ Includes or excludes e2fsprogs. |
| 28 |
+ |
| 29 |
*--*[*no-*]*zfs*:: |
| 30 |
Includes or excludes ZFS support. |
| 31 |
|
| 32 |
|
| 33 |
diff --git a/gen_cmdline.sh b/gen_cmdline.sh |
| 34 |
index 938b1a5..a305201 100755 |
| 35 |
--- a/gen_cmdline.sh |
| 36 |
+++ b/gen_cmdline.sh |
| 37 |
@@ -91,6 +91,8 @@ longusage() { |
| 38 |
echo " --mdadm-config=<file> Use file as mdadm.conf in initramfs" |
| 39 |
echo " --dmraid Include DMRAID support" |
| 40 |
echo " --no-dmraid Exclude DMRAID support" |
| 41 |
+ echo " --e2fsprogs Include e2fsprogs" |
| 42 |
+ echo " --no-e2fsprogs Exclude e2fsprogs" |
| 43 |
echo " --zfs Include ZFS support" |
| 44 |
echo " --no-zfs Exclude ZFS support" |
| 45 |
echo " --multipath Include Multipath support" |
| 46 |
@@ -306,6 +308,10 @@ parse_cmdline() { |
| 47 |
fi |
| 48 |
print_info 2 "CMD_DMRAID: ${CMD_DMRAID}" |
| 49 |
;; |
| 50 |
+ --e2fsprogs|--no-e2fsprogs) |
| 51 |
+ CMD_E2FSPROGS=`parse_optbool "$*"` |
| 52 |
+ print_info 2 "CMD_E2FSPROGS: ${CMD_E2FSPROGS}" |
| 53 |
+ ;; |
| 54 |
--zfs|--no-zfs) |
| 55 |
CMD_ZFS=`parse_optbool "$*"` |
| 56 |
print_info 2 "CMD_ZFS: ${CMD_ZFS}" |
| 57 |
|
| 58 |
diff --git a/gen_determineargs.sh b/gen_determineargs.sh |
| 59 |
index 7f352f8..92a6458 100755 |
| 60 |
--- a/gen_determineargs.sh |
| 61 |
+++ b/gen_determineargs.sh |
| 62 |
@@ -122,6 +122,7 @@ determine_real_args() { |
| 63 |
set_config_with_override BOOL GPG CMD_GPG |
| 64 |
set_config_with_override BOOL MDADM CMD_MDADM |
| 65 |
set_config_with_override STRING MDADM_CONFIG CMD_MDADM_CONFIG |
| 66 |
+ set_config_with_override BOOL E2FSPROGS CMD_E2FSPROGS "no" |
| 67 |
set_config_with_override BOOL ZFS CMD_ZFS |
| 68 |
set_config_with_override BOOL MULTIPATH CMD_MULTIPATH |
| 69 |
set_config_with_override BOOL FIRMWARE CMD_FIRMWARE |
| 70 |
|
| 71 |
diff --git a/gen_initramfs.sh b/gen_initramfs.sh |
| 72 |
index ee21d2f..9d070f5 100755 |
| 73 |
--- a/gen_initramfs.sh |
| 74 |
+++ b/gen_initramfs.sh |
| 75 |
@@ -127,7 +127,7 @@ append_busybox() { |
| 76 |
rm -rf "${TEMP}/initramfs-busybox-temp" > /dev/null |
| 77 |
} |
| 78 |
|
| 79 |
-append_e2fstools(){ |
| 80 |
+append_e2fsprogs(){ |
| 81 |
if [ -d "${TEMP}"/initramfs-e2fsprogs-temp ] |
| 82 |
then |
| 83 |
rm -r "${TEMP}"/initramfs-e2fsprogs-temp |
| 84 |
@@ -758,7 +758,7 @@ create_initramfs() { |
| 85 |
append_data 'base_layout' |
| 86 |
append_data 'auxilary' "${BUSYBOX}" |
| 87 |
append_data 'busybox' "${BUSYBOX}" |
| 88 |
- append_data 'e2fstools' |
| 89 |
+ isTrue "${CMD_E2FSPROGS}" && append_data 'e2fsprogs' |
| 90 |
append_data 'lvm' "${LVM}" |
| 91 |
append_data 'dmraid' "${DMRAID}" |
| 92 |
append_data 'iscsi' "${ISCSI}" |
| 93 |
|
| 94 |
diff --git a/genkernel.conf b/genkernel.conf |
| 95 |
index 5d93a66..af73931 100644 |
| 96 |
--- a/genkernel.conf |
| 97 |
+++ b/genkernel.conf |
| 98 |
@@ -87,6 +87,9 @@ USECOLOR="yes" |
| 99 |
# Add iSCSI support. |
| 100 |
#ISCSI="no" |
| 101 |
|
| 102 |
+# Add e2fsprogs support. |
| 103 |
+#E2FSPROGS="no" |
| 104 |
+ |
| 105 |
# Include support for unionfs |
| 106 |
#UNIONFS="1" |
Archives