Remove broken grub code

cleanup-cruft
agaffney 17 years ago
parent ea695cec24
commit 6e47f147d8

@ -2,6 +2,10 @@
# Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni
# Distributed under the GPL v2 # 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: 07 Aug 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
Only append splash portion to initramfs if SPLASH is set Only append splash portion to initramfs if SPLASH is set

@ -84,7 +84,6 @@ longusage() {
echo " --mdadm Copy /etc/mdadm.conf to initramfs" echo " --mdadm Copy /etc/mdadm.conf to initramfs"
echo " --dmraid Include DMRAID support" echo " --dmraid Include DMRAID support"
echo " --slowusb Enables extra pauses for slow USB CD boots" 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 " --linuxrc=<file> Specifies a user created linuxrc"
echo " --disklabel Include disk label and uuid support in your" echo " --disklabel Include disk label and uuid support in your"
echo " ramdisk" echo " ramdisk"
@ -259,10 +258,6 @@ parse_cmdline() {
CMD_DMRAID=1 CMD_DMRAID=1
print_info 2 "CMD_DMRAID: ${CMD_DMRAID}" print_info 2 "CMD_DMRAID: ${CMD_DMRAID}"
;; ;;
--bootloader=*)
CMD_BOOTLOADER=`parse_opt "$*"`
print_info 2 "CMD_BOOTLOADER: ${CMD_BOOTLOADER}"
;;
--loglevel=*) --loglevel=*)
CMD_LOGLEVEL=`parse_opt "$*"` CMD_LOGLEVEL=`parse_opt "$*"`
LOGLEVEL="${CMD_LOGLEVEL}" LOGLEVEL="${CMD_LOGLEVEL}"

@ -123,18 +123,6 @@ determine_real_args() {
DMRAID_BINCACHE=`arch_replace "${DMRAID_BINCACHE}"` DMRAID_BINCACHE=`arch_replace "${DMRAID_BINCACHE}"`
BLKID_BINCACHE=`arch_replace "${BLKID_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" ] if [ "${NO_KERNEL_SOURCES}" != "1" ]
then then
if [ ! -d ${KERNEL_DIR} ] if [ ! -d ${KERNEL_DIR} ]

@ -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_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_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_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.$$ TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$
@ -324,7 +323,6 @@ fi
if [ "${BUILD_KERNEL}" -eq '1' ] if [ "${BUILD_KERNEL}" -eq '1' ]
then then
set_bootloader
print_info 1 '' print_info 1 ''
print_info 1 "Kernel compiled successfully!" print_info 1 "Kernel compiled successfully!"
print_info 1 '' print_info 1 ''

@ -38,9 +38,6 @@ SAVE_CONFIG="yes"
# Use Color output in Genkernel? # Use Color output in Genkernel?
USECOLOR="yes" USECOLOR="yes"
# Add new kernel to grub?
# BOOTLOADER="grub"
# Clear build cache dir # Clear build cache dir
# CLEAR_CACHE_DIR="yes" # CLEAR_CACHE_DIR="yes"

Loading…
Cancel
Save