gen_initramfs: drop --disklabel, always copy blkid to initramfs

blkid will be used to detect partition types as well.

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.

gen_cmdline.sh

@@ -110,8 +110,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 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}"

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

gen_initramfs.sh

@@ -939,7 +939,7 @@ create_initramfs() {
 
 	append_data 'btrfs' "${BTRFS}"
 
-	append_data 'blkid' "${DISKLABEL}"
+	append_data 'blkid'
 
 	append_data 'splash' "${SPLASH}"
 

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"