diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt index 994d7de..165de13 100644 --- a/doc/genkernel.8.txt +++ b/doc/genkernel.8.txt @@ -295,9 +295,6 @@ INITIALIZATION *--genzimage*:: Make and install kernelz image from 'arch/powerpc/boot/zImage.initrd'. -*--*[*no-*]*disklabel*:: - Includes or excludes disk label and uuid support in your initrd. - *--*[*no-*]*luks*:: Includes or excludes Luks support from static binaries if they exist on the system. diff --git a/gen_cmdline.sh b/gen_cmdline.sh index d7cf536..fc969f0 100755 --- a/gen_cmdline.sh +++ b/gen_cmdline.sh @@ -110,8 +110,6 @@ longusage() { echo " --linuxrc= Specifies a user created linuxrc" echo " --busybox-config= Specifies a user created busybox config" echo " --genzimage Make and install kernelz image (PowerPC)" - echo " --disklabel Include disk label and uuid support in your ramdisk" - echo " --no-disklabel Exclude disk label and uuid support in your ramdisk" echo " --luks Include LUKS support" echo " --> 'emerge cryptsetup-luks' with USE=-dynamic" echo " --no-luks Exclude LUKS support" @@ -545,10 +543,6 @@ parse_cmdline() { # ENABLE_PEGASOS_HACKS="yes" # print_info 2 "ENABLE_PEGASOS_HACKS: ${ENABLE_PEGASOS_HACKS}" ;; - --disklabel|--no-disklabel) - CMD_DISKLABEL=`parse_optbool "$*"` - print_info 2 "CMD_DISKLABEL: ${CMD_DISKLABEL}" - ;; --luks|--no-luks) CMD_LUKS=`parse_optbool "$*"` print_info 2 "CMD_LUKS: ${CMD_LUKS}" diff --git a/gen_determineargs.sh b/gen_determineargs.sh index 35ab701..36c9388 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -118,7 +118,6 @@ determine_real_args() { set_config_with_override BOOL BUSYBOX CMD_BUSYBOX "yes" set_config_with_override BOOL NETBOOT CMD_NETBOOT set_config_with_override STRING REAL_ROOT CMD_REAL_ROOT - set_config_with_override BOOL DISKLABEL CMD_DISKLABEL set_config_with_override BOOL LUKS CMD_LUKS set_config_with_override BOOL GPG CMD_GPG set_config_with_override BOOL MDADM CMD_MDADM diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 33c3081..6fef8d0 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -939,7 +939,7 @@ create_initramfs() { append_data 'btrfs' "${BTRFS}" - append_data 'blkid' "${DISKLABEL}" + append_data 'blkid' append_data 'splash' "${SPLASH}" diff --git a/genkernel.conf b/genkernel.conf index e9f5ae1..c9240c7 100644 --- a/genkernel.conf +++ b/genkernel.conf @@ -103,9 +103,6 @@ USECOLOR="yes" # Specify specific firmware files to include. This overrides FIRMWARE_DIR #FIRMWARE_FILES="" -# Enable disklabel support (copies blkid to initrd) -DISKLABEL="yes" - # Add new kernel to grub? #BOOTLOADER="grub"