Remove broken grub code

diff --git a/ChangeLog b/ChangeLog
index 70c27343c09c1396b878a51de4575ba74efe23f8..75a7f21b4804c353a9e167541279156eea796d04 100644 (file)
--- 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 354df8036ac83fd4cb01f331245bcf3cbb7d4493..b16c8ee48571943909a14d1d7b26e3b2eeeb5c70 100755 (executable)
--- 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 dbe8fd6f9f067c9022922b3a4c8abeab3bd42613..93e49b4e913ece4f570bfbab7d849c4ee63720be 100644 (file)
--- 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 e05be9e0ffaac27813a36a321829e3201545439d..fc423e7b2fff7ab44a6f3700f048feaaebbd64af 100755 (executable)
--- 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 9c8107dd833bb60e22208f911fae984f73048d2b..fc9ab55faf01c2ce1affbff61db0e91a1738a765 100755 (executable)
--- 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"