From 25e7fa89be523533fa71ef786ffedb4e58c9f845 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Sun, 28 Jun 2009 14:42:36 -0500 Subject: [PATCH] Restore BOOTLOADER="grub" example line in genkernel.conf for gentoo bug #274768 --- ChangeLog | 5 +++++ defaults/modprobe | 3 ++- genkernel.conf | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7ff705e..f56fdbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS) # Distributed under the GPL v2 + 28 Jun 2009; Andrew Gaffney defaults/modprobe, + genkernel.conf: + Restore BOOTLOADER="grub" example line in genkernel.conf for gentoo bug + #274768 + 12 May 2009; Andrew Gaffney arch/x86/modules_load, defaults/initrd.scripts: Apply fix to deference links for gentoo bug #269603 diff --git a/defaults/modprobe b/defaults/modprobe index 1591c42..8790122 100755 --- a/defaults/modprobe +++ b/defaults/modprobe @@ -22,7 +22,7 @@ modules_dep_list() { echo 'modules_dep_list(): Improper usage!' exit 1 fi - cat /lib/modules/${KV}/modules.dep | grep ${1}${KSUFF}\: | cut -d\: -f2 + cat /lib/modules/${KV}/modules.dep | grep /"${1}${KSUFF}:" | cut -d':' -f2 } @@ -84,6 +84,7 @@ modprobe2() { real_path=`real_mod_path ${1}` if [ "${real_path}" = '' -o "${real_path}" = ' ' ] then + [ "${2}" = '-n' ] && echo -n " -> $1" echo ' module not found.' exit 2 fi diff --git a/genkernel.conf b/genkernel.conf index 50052b7..8653a85 100644 --- a/genkernel.conf +++ b/genkernel.conf @@ -79,6 +79,9 @@ USECOLOR="yes" # Enable disklabel support (copies blkid to initrd) # DISKLABEL="yes" +# Add new kernel to grub? +# BOOTLOADER="grub" + # =========Low Level Compile Settings========= # # GNU Make to use for kernel. See also the --kernel-make command line option. -- 2.26.2