Restore BOOTLOADER="grub" example line in genkernel.conf for gentoo bug #274768

diff --git a/ChangeLog b/ChangeLog
index 7ff705e352748c69d35e78459c3afb5db87044f0..f56fdbf021e3055e550ac168df12d93dc7b68cf9 100644 (file)
--- 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 <agaffney@gentoo.org> defaults/modprobe,
+  genkernel.conf:
+  Restore BOOTLOADER="grub" example line in genkernel.conf for gentoo bug
+  #274768
+
   12 May 2009; Andrew Gaffney <agaffney@gentoo.org> 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 1591c427635c4022b263da3022e21b401acb4b2e..87901220e100641cec407c0fa63dc292ed377a40 100755 (executable)
--- 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 50052b7f4bcb71cfe2222206cad952126c98c279..8653a850e334af6e00753b21ec31a4d2a6833173 100644 (file)
--- 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.