| 1 |
commit: 945b3dc65cb2577a9962db40848eaeae3fc2a425 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 28 13:53:51 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 28 15:42:01 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=945b3dc6 |
| 7 |
|
| 8 |
Remove --disklabel option |
| 9 |
|
| 10 |
Now that we always build util-linux for switch_root, we no longer |
| 11 |
need this option. |
| 12 |
|
| 13 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 14 |
|
| 15 |
arch/mips/config.sh | 1 - |
| 16 |
doc/genkernel.8.txt | 4 ---- |
| 17 |
gen_cmdline.sh | 6 ------ |
| 18 |
gen_determineargs.sh | 1 - |
| 19 |
gen_initramfs.sh | 1 - |
| 20 |
genkernel.conf | 3 --- |
| 21 |
6 files changed, 16 deletions(-) |
| 22 |
|
| 23 |
diff --git a/arch/mips/config.sh b/arch/mips/config.sh |
| 24 |
index b258fb2..1a10862 100644 |
| 25 |
--- a/arch/mips/config.sh |
| 26 |
+++ b/arch/mips/config.sh |
| 27 |
@@ -11,7 +11,6 @@ KERNEL_BINARY="./vmlinux" |
| 28 |
NOINITRDMODULES="yes" |
| 29 |
BUSYBOX=1 |
| 30 |
DMRAID=0 |
| 31 |
-DISKLABEL=0 |
| 32 |
|
| 33 |
# genkernel on mips is only used for LiveCDs && netboots. Catalyst |
| 34 |
# will know where to get the kernels at. |
| 35 |
|
| 36 |
diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt |
| 37 |
index f0e4414..2625d6f 100644 |
| 38 |
--- a/doc/genkernel.8.txt |
| 39 |
+++ b/doc/genkernel.8.txt |
| 40 |
@@ -416,10 +416,6 @@ system is able to load multiple initramfs. |
| 41 |
*--genzimage*:: |
| 42 |
Make and install kernelz image from 'arch/powerpc/boot/zImage.initrd'. |
| 43 |
|
| 44 |
-*--*[*no-*]*disklabel*:: |
| 45 |
- Includes or excludes disk label and uuid support in your initramfs. |
| 46 |
- When enabled, this will compile util-linux for you. |
| 47 |
- |
| 48 |
*--*[*no-*]*luks*:: |
| 49 |
Includes or excludes LUKS support. |
| 50 |
When enabled, this will compile cryptsetup for you. |
| 51 |
|
| 52 |
diff --git a/gen_cmdline.sh b/gen_cmdline.sh |
| 53 |
index 5cc0d87..33bf1c5 100755 |
| 54 |
--- a/gen_cmdline.sh |
| 55 |
+++ b/gen_cmdline.sh |
| 56 |
@@ -163,8 +163,6 @@ longusage() { |
| 57 |
echo " --linuxrc=<file> Specifies a user created linuxrc" |
| 58 |
echo " --busybox-config=<file> Specifies a user created busybox config" |
| 59 |
echo " --genzimage Make and install kernelz image (PowerPC)" |
| 60 |
- echo " --disklabel Include disk label and uuid support in your initramfs" |
| 61 |
- echo " --no-disklabel Exclude disk label and uuid support in your initramfs" |
| 62 |
echo " --luks Include LUKS support" |
| 63 |
echo " --no-luks Exclude LUKS support" |
| 64 |
echo " --gpg Include GPG-armored LUKS key support" |
| 65 |
@@ -761,10 +759,6 @@ parse_cmdline() { |
| 66 |
# ENABLE_PEGASOS_HACKS="yes" |
| 67 |
# print_info 3 "ENABLE_PEGASOS_HACKS: ${ENABLE_PEGASOS_HACKS}" |
| 68 |
;; |
| 69 |
- --disklabel|--no-disklabel) |
| 70 |
- CMD_DISKLABEL=$(parse_optbool "$*") |
| 71 |
- print_info 3 "CMD_DISKLABEL: ${CMD_DISKLABEL}" |
| 72 |
- ;; |
| 73 |
--luks|--no-luks) |
| 74 |
CMD_LUKS=$(parse_optbool "$*") |
| 75 |
print_info 3 "CMD_LUKS: ${CMD_LUKS}" |
| 76 |
|
| 77 |
diff --git a/gen_determineargs.sh b/gen_determineargs.sh |
| 78 |
index 0fe8886..f28c8d6 100755 |
| 79 |
--- a/gen_determineargs.sh |
| 80 |
+++ b/gen_determineargs.sh |
| 81 |
@@ -396,7 +396,6 @@ determine_real_args() { |
| 82 |
set_config_with_override BOOL UNIONFS CMD_UNIONFS "no" |
| 83 |
set_config_with_override BOOL NETBOOT CMD_NETBOOT "no" |
| 84 |
set_config_with_override STRING REAL_ROOT CMD_REAL_ROOT |
| 85 |
- set_config_with_override BOOL DISKLABEL CMD_DISKLABEL "yes" |
| 86 |
set_config_with_override BOOL LUKS CMD_LUKS "no" |
| 87 |
set_config_with_override BOOL GPG CMD_GPG "no" |
| 88 |
set_config_with_override BOOL MDADM CMD_MDADM "no" |
| 89 |
|
| 90 |
diff --git a/gen_initramfs.sh b/gen_initramfs.sh |
| 91 |
index 479e6a6..9852719 100755 |
| 92 |
--- a/gen_initramfs.sh |
| 93 |
+++ b/gen_initramfs.sh |
| 94 |
@@ -400,7 +400,6 @@ append_base_layout() { |
| 95 |
isTrue "${BUSYBOX}" && build_parameters+=( --busybox ) || build_parameters+=( --no-busybox ) |
| 96 |
isTrue "${BCACHE}" && build_parameters+=( --bcache ) || build_parameters+=( --no-bcache ) |
| 97 |
isTrue "${B2SUM}" && build_parameters+=( --b2sum ) || build_parameters+=( --no-b2sum ) |
| 98 |
- isTrue "${DISKLABEL}" && build_parameters+=( --disklabel ) || build_parameters+=( --no-disklabel ) |
| 99 |
isTrue "${BTRFS}" && build_parameters+=( --btrfs ) || build_parameters+=( --no-btrfs ) |
| 100 |
isTrue "${ISCSI}" && build_parameters+=( --iscsi ) || build_parameters+=( --no-iscsi ) |
| 101 |
isTrue "${MULTIPATH}" && build_parameters+=( --multipath ) || build_parameters+=( --no-multipath ) |
| 102 |
|
| 103 |
diff --git a/genkernel.conf b/genkernel.conf |
| 104 |
index 654f185..71d4fb9 100644 |
| 105 |
--- a/genkernel.conf |
| 106 |
+++ b/genkernel.conf |
| 107 |
@@ -152,9 +152,6 @@ NOCOLOR="false" |
| 108 |
# FIRMWARE_DIR will be included. |
| 109 |
#FIRMWARE_FILES="" |
| 110 |
|
| 111 |
-# Add disklabel support (copies blkid to initramfs) |
| 112 |
-#DISKLABEL="yes" |
| 113 |
- |
| 114 |
# Add new kernel to grub |
| 115 |
# Possible values: empty/"no", "grub", "grub2" |
| 116 |
#BOOTLOADER="no" |
Archives