From: agaffney <agaffney@kagome.(none)>
Date: Thu, 21 Aug 2008 22:14:32 +0000 (-0500)
Subject: Remove broken grub code
X-Git-Tag: v3.4.10.902~54
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6e47f147d85bd0d95ad76912e508e56de4dabc7b;p=genkernel.git

Remove broken grub code
---

diff --git a/ChangeLog b/ChangeLog
index 70c2734..75a7f21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni
 # Distributed under the GPL v2
 
+  21 Aug 2008; Andrew Gaffney <agaffney@gentoo.org> gen_cmdline.sh,
+  gen_determineargs.sh, genkernel, genkernel.conf:
+  Remove broken grub code
+
   07 Aug 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
   Only append splash portion to initramfs if SPLASH is set
 
diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 354df80..b16c8ee 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -84,7 +84,6 @@ longusage() {
   echo "	--mdadm			Copy /etc/mdadm.conf to initramfs"
   echo "	--dmraid		Include DMRAID support"
   echo "	--slowusb		Enables extra pauses for slow USB CD boots"
-  echo "	--bootloader=grub	Add new kernel to GRUB configuration"
   echo "	--linuxrc=<file>	Specifies a user created linuxrc"
   echo "	--disklabel		Include disk label and uuid support in your"
   echo "				ramdisk"
@@ -259,10 +258,6 @@ parse_cmdline() {
 			CMD_DMRAID=1
 			print_info 2 "CMD_DMRAID: ${CMD_DMRAID}"
 			;;
-		--bootloader=*)
-			CMD_BOOTLOADER=`parse_opt "$*"`
-			print_info 2 "CMD_BOOTLOADER: ${CMD_BOOTLOADER}"
-			;;
 		--loglevel=*)
 			CMD_LOGLEVEL=`parse_opt "$*"`
 			LOGLEVEL="${CMD_LOGLEVEL}"
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index dbe8fd6..93e49b4 100644
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -123,18 +123,6 @@ determine_real_args() {
 	DMRAID_BINCACHE=`arch_replace "${DMRAID_BINCACHE}"`
 	BLKID_BINCACHE=`arch_replace "${BLKID_BINCACHE}"`
 	
-
-	if [ "${CMD_BOOTLOADER}" != '' ]
-	then
-		BOOTLOADER="${CMD_BOOTLOADER}"
-
-		if [ "${CMD_BOOTLOADER}" != "${CMD_BOOTLOADER/:/}" ]
-	then
-			BOOTFS=`echo "${CMD_BOOTLOADER}" | cut -f2- -d:`
-			BOOTLOADER=`echo "${CMD_BOOTLOADER}" | cut -f1 -d:`
-	fi
-	fi
-
 	if [ "${NO_KERNEL_SOURCES}" != "1" ]
 	then
 		if [ ! -d ${KERNEL_DIR} ]
diff --git a/genkernel b/genkernel
index e05be9e..fc423e7 100755
--- a/genkernel
+++ b/genkernel
@@ -43,7 +43,6 @@ source ${GK_SHARE}/gen_configkernel.sh || gen_die "Could not read ${GK_SHARE}/ge
 source ${GK_SHARE}/gen_initramfs.sh || gen_die "Could not read ${GK_SHARE}/gen_initramfs.sh"
 source ${GK_SHARE}/gen_moddeps.sh || gen_die "Could not read ${GK_SHARE}/gen_moddeps.sh"
 source ${GK_SHARE}/gen_package.sh || gen_die "Could not read ${GK_SHARE}/gen_package.sh"
-source ${GK_SHARE}/gen_bootloader.sh || gen_die "Could not read ${GK_SHARE}/gen_bootloader.sh"
 
 TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$
 
@@ -324,7 +323,6 @@ fi
 
 if [ "${BUILD_KERNEL}" -eq '1' ]
 then
-	set_bootloader
 	print_info 1 ''
 	print_info 1 "Kernel compiled successfully!"
 	print_info 1 ''
diff --git a/genkernel.conf b/genkernel.conf
index 9c8107d..fc9ab55 100755
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -38,9 +38,6 @@ SAVE_CONFIG="yes"
 # Use Color output in Genkernel?
 USECOLOR="yes"
 
-# Add new kernel to grub?
-# BOOTLOADER="grub"
-
 # Clear build cache dir
 # CLEAR_CACHE_DIR="yes"