commit: 945b3dc65cb2577a9962db40848eaeae3fc2a425
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 13:53:51 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 15:42:01 2020 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=945b3dc6
Remove --disklabel option
Now that we always build util-linux for switch_root, we no longer
need this option.
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
arch/mips/config.sh | 1 -
doc/genkernel.8.txt | 4 ----
gen_cmdline.sh | 6 ------
gen_determineargs.sh | 1 -
gen_initramfs.sh | 1 -
genkernel.conf | 3 ---
6 files changed, 16 deletions(-)
diff --git a/arch/mips/config.sh b/arch/mips/config.sh
index b258fb2..1a10862 100644
--- a/arch/mips/config.sh
+++ b/arch/mips/config.sh
@@ -11,7 +11,6 @@ KERNEL_BINARY="./vmlinux"
NOINITRDMODULES="yes"
BUSYBOX=1
DMRAID=0
-DISKLABEL=0
# genkernel on mips is only used for LiveCDs && netboots. Catalyst
# will know where to get the kernels at.
diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index f0e4414..2625d6f 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -416,10 +416,6 @@ system is able to load multiple initramfs.
*--genzimage*::
Make and install kernelz image from 'arch/powerpc/boot/zImage.initrd'.
-*--*[*no-*]*disklabel*::
- Includes or excludes disk label and uuid support in your initramfs.
- When enabled, this will compile util-linux for you.
-
*--*[*no-*]*luks*::
Includes or excludes LUKS support.
When enabled, this will compile cryptsetup for you.
diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 5cc0d87..33bf1c5 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -163,8 +163,6 @@ longusage() {
echo " --linuxrc=<file> Specifies a user created linuxrc"
echo " --busybox-config=<file> Specifies a user created busybox config"
echo " --genzimage Make and install kernelz image
(PowerPC)"
- echo " --disklabel Include disk label and uuid support in
your initramfs"
- echo " --no-disklabel Exclude disk label and uuid support in
your initramfs"
echo " --luks Include LUKS support"
echo " --no-luks Exclude LUKS support"
echo " --gpg Include GPG-armored LUKS key support"
@@ -761,10 +759,6 @@ parse_cmdline() {
# ENABLE_PEGASOS_HACKS="yes"
# print_info 3 "ENABLE_PEGASOS_HACKS:
${ENABLE_PEGASOS_HACKS}"
;;
- --disklabel|--no-disklabel)
- CMD_DISKLABEL=$(parse_optbool "$*")
- print_info 3 "CMD_DISKLABEL: ${CMD_DISKLABEL}"
- ;;
--luks|--no-luks)
CMD_LUKS=$(parse_optbool "$*")
print_info 3 "CMD_LUKS: ${CMD_LUKS}"
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 0fe8886..f28c8d6 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -396,7 +396,6 @@ determine_real_args() {
set_config_with_override BOOL UNIONFS
CMD_UNIONFS "no"
set_config_with_override BOOL NETBOOT
CMD_NETBOOT "no"
set_config_with_override STRING REAL_ROOT
CMD_REAL_ROOT
- set_config_with_override BOOL DISKLABEL
CMD_DISKLABEL "yes"
set_config_with_override BOOL LUKS
CMD_LUKS "no"
set_config_with_override BOOL GPG
CMD_GPG "no"
set_config_with_override BOOL MDADM
CMD_MDADM "no"
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 479e6a6..9852719 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -400,7 +400,6 @@ append_base_layout() {
isTrue "${BUSYBOX}" && build_parameters+=( --busybox ) ||
build_parameters+=( --no-busybox )
isTrue "${BCACHE}" && build_parameters+=( --bcache ) ||
build_parameters+=( --no-bcache )
isTrue "${B2SUM}" && build_parameters+=( --b2sum ) ||
build_parameters+=( --no-b2sum )
- isTrue "${DISKLABEL}" && build_parameters+=( --disklabel ) ||
build_parameters+=( --no-disklabel )
isTrue "${BTRFS}" && build_parameters+=( --btrfs ) ||
build_parameters+=( --no-btrfs )
isTrue "${ISCSI}" && build_parameters+=( --iscsi ) ||
build_parameters+=( --no-iscsi )
isTrue "${MULTIPATH}" && build_parameters+=( --multipath ) ||
build_parameters+=( --no-multipath )
diff --git a/genkernel.conf b/genkernel.conf
index 654f185..71d4fb9 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -152,9 +152,6 @@ NOCOLOR="false"
# FIRMWARE_DIR will be included.
#FIRMWARE_FILES=""
-# Add disklabel support (copies blkid to initramfs)
-#DISKLABEL="yes"
-
# Add new kernel to grub
# Possible values: empty/"no", "grub", "grub2"
#BOOTLOADER="no"
