From: Tim Yamin <plasmaroo@gentoo.org>
Date: Tue, 12 Jul 2005 17:26:58 +0000 (+0000)
Subject: >> 3.2.2. Fix #83771, #97700, #98590, #98594, #98661, #98746.
X-Git-Tag: v3.4.10.902~501
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=056515d7d87c1bb9e8ae9e0135d6097f9d4e9166;p=genkernel.git

>> 3.2.2. Fix #83771, #97700, #98590, #98594, #98661, #98746.


git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@251 67a159dc-881f-0410-a524-ba9dfbe2cb84
---

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index 100648c..228fc01 100644
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -39,10 +39,15 @@ modules_scan() {
 			echo -e "${BOLD}   ::${NORMAL} Skipping ${x}..."
 		elif [ "${MLOAD}" = "${MLIST}" ] # == No change == No specified no-load
 		then
-			echo -ne "${BOLD}   ::${NORMAL} Scanning for ${x}..."
-			modprobe ${x} -n
-			backup
-			echo -ne "${NORMAL}"
+			[ -n "${DEBUG}" ] && echo -ne "${BOLD}   ::${NORMAL} Checking for ${x}..."
+			# find -name does not work since the return status is always zero
+			if find /lib/modules | grep "${x}${KSUFF}" 2>/dev/null
+			then
+				echo -ne "${BOLD}   ::${NORMAL} Scanning for ${x}..."
+				modprobe ${x} -n
+				backup
+				echo -ne "${NORMAL}"
+			fi
 		else
 			echo -e "${BOLD}   ::${NORMAL} Skipping ${x}..."
 		fi
diff --git a/generic/modprobe b/generic/modprobe
index 2265b4f..90cac83 100755
--- a/generic/modprobe
+++ b/generic/modprobe
@@ -65,7 +65,7 @@ is_module_already_loaded()
 
 real_mod_path()
 {
-	# find doesn't work like we expect, let's add a grep to it
+	# Find -name is no good since the return status is always zero
 	find /lib/modules | grep "${1}${KSUFF}"
 }
 
diff --git a/genkernel b/genkernel
index 64ee5b5..eff9f39 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # Genkernel v3
 
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
-GK_V='3.2.1'
+GK_V='3.2.2'
 
 TEMP='/var/tmp/genkernel'
 TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified.
diff --git a/genkernel.conf b/genkernel.conf
index 37891cd..f450f0e 100755
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -105,7 +105,7 @@ LVM2_DIR="LVM2.${LVM2_VER}"
 LVM2_SRCTAR="${GK_SHARE}/pkg/LVM2.${LVM2_VER}.tgz"
 LVM2_BINCACHE="%%CACHE%%/LVM2.${LVM2_VER}-%%ARCH%%.tar.bz2"
 
-DMRAID_VER="1.0.0.rc6"
+DMRAID_VER="1.0.0.rc8"
 DMRAID_DIR="dmraid/${DMRAID_VER}"
 DMRAID_SRCTAR="${GK_SHARE}/pkg/dmraid-${DMRAID_VER}.tar.bz2"
 DMRAID_BINCACHE="%%CACHE%%/dmraid-${DMRAID_VER}-%%ARCH%%.tar.bz2"
@@ -120,4 +120,3 @@ E2FSPROGS_VER="1.38"
 E2FSPROGS_DIR="e2fsprogs-${E2FSPROGS_VER}"
 E2FSPROGS_SRCTAR="${GK_SHARE}/pkg/e2fsprogs-${E2FSPROGS_VER}.tar.gz"
 BLKID_BINCACHE="%%CACHE%%/blkid-${E2FSPROGS_VER}-%%ARCH%%.bz2"
-