From: Matthias Schwarzott <zzam@gentoo.org>
Date: Sat, 10 Feb 2007 23:27:57 +0000 (+0000)
Subject: Corrected both grep-expressions, to not get commented blacklist entries, and to get... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=460012df5b700a8c10ad2ffdedc705d9aec2d342;p=gentoo.git

Corrected both grep-expressions, to not get commented blacklist entries, and to get log output correct.
Package-Manager: portage-2.1.2-r9
---

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index e579da696072..802fba48cf54 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.250 2007/02/10 22:28:14 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.251 2007/02/10 23:27:57 zzam Exp $
+
+  10 Feb 2007; Matthias Schwarzott <zzam@gentoo.org> files/modprobe.sh:
+  Corrected both grep-expressions, to not get commented blacklist entries, and
+  to get log output correct.
 
 *udev-104-r10 (10 Feb 2007)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 7dab00626648..dea758ea8710 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -17,10 +17,10 @@ AUX 95-net.rules 550 RMD160 8e10d27a37f15bbcd8367266693b58d7a9101370 SHA1 53cf6e
 MD5 b9c490717a6a973b52edd7082a7b09f8 files/95-net.rules 550
 RMD160 8e10d27a37f15bbcd8367266693b58d7a9101370 files/95-net.rules 550
 SHA256 19c6783fdd8bfb4f66376fb4929cd9a1a554c8949a40364e2a5b36b2e31f7574 files/95-net.rules 550
-AUX modprobe.sh 731 RMD160 99d1cdbed347437bc2524350c07818677afe0d6d SHA1 dbc21b0b556496454bf9beab2321e314790cb483 SHA256 fa1037694aba05a7d40a44bf83d6a00839545a3d3730c8033cc8a215be62fcb9
-MD5 cf65ebd7bb614b6fcfc082bdd0f221f1 files/modprobe.sh 731
-RMD160 99d1cdbed347437bc2524350c07818677afe0d6d files/modprobe.sh 731
-SHA256 fa1037694aba05a7d40a44bf83d6a00839545a3d3730c8033cc8a215be62fcb9 files/modprobe.sh 731
+AUX modprobe.sh 748 RMD160 f695e97729043fb821b0b6cda0fc9861256102bc SHA1 c32f29a6e80bde616e67dd3664038f5c341db03b SHA256 c5583754db49512b08b02f2d16ebf4a63a1582c0bea4c7aa3848f03f06979c67
+MD5 fbc90bd2e42adc6a7c82b2cd09914a56 files/modprobe.sh 748
+RMD160 f695e97729043fb821b0b6cda0fc9861256102bc files/modprobe.sh 748
+SHA256 c5583754db49512b08b02f2d16ebf4a63a1582c0bea4c7aa3848f03f06979c67 files/modprobe.sh 748
 AUX net-104-r10.sh 719 RMD160 e0c3a76c24108d43518f301ebe5cff7f3e06081d SHA1 baa060c99d7c38c26bcc629ee9844319bd886647 SHA256 e3d7b8a447087b7357b6b7713089bf84aecf598714a569be75c45d7c3a7581ee
 MD5 6e80c0636d03874473a1f17a4af2b6e7 files/net-104-r10.sh 719
 RMD160 e0c3a76c24108d43518f301ebe5cff7f3e06081d files/net-104-r10.sh 719
@@ -291,10 +291,10 @@ EBUILD udev-104-r9.ebuild 9219 RMD160 ff22702a590bc9a296a9d7d6da877d8086636ece S
 MD5 b13be0a9f9ce370c1f349e6814deaa24 udev-104-r9.ebuild 9219
 RMD160 ff22702a590bc9a296a9d7d6da877d8086636ece udev-104-r9.ebuild 9219
 SHA256 3eb16d236354c78ccac5efb590eb9448f86a76709cc11a5763dde6a7b7512825 udev-104-r9.ebuild 9219
-MISC ChangeLog 46930 RMD160 3ebb1e8efc0de2a83c46bfc1d68036762a79c877 SHA1 43e03affde58b83cc494567fb9739425641546ca SHA256 517eee42abce8f22fa0be6cf38c05705ffd9ec43f8e6adc1b166152d6953b0e2
-MD5 889a9bd492c071020cdc124b028c15ce ChangeLog 46930
-RMD160 3ebb1e8efc0de2a83c46bfc1d68036762a79c877 ChangeLog 46930
-SHA256 517eee42abce8f22fa0be6cf38c05705ffd9ec43f8e6adc1b166152d6953b0e2 ChangeLog 46930
+MISC ChangeLog 47111 RMD160 bdd5d494c992135e0deaf154f40df2f52cf876e0 SHA1 f970069e3d93f9e63092f093c50389be4d6ba1a2 SHA256 011cccb76f9111f09eba34a3cdfd48eb3918c5200d808a5cded65bbcb803a420
+MD5 0de01a8f5332690ea60083d8b0ad4d0b ChangeLog 47111
+RMD160 bdd5d494c992135e0deaf154f40df2f52cf876e0 ChangeLog 47111
+SHA256 011cccb76f9111f09eba34a3cdfd48eb3918c5200d808a5cded65bbcb803a420 ChangeLog 47111
 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447
 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447
@@ -344,7 +344,7 @@ SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFzkcJt2vP6XvVdOcRAtxKAKDKF9+6mDLyGBTTWJSgN2O7+c0QmgCg4d9u
-Be4Bzv1114WrOx2WrdcNH9I=
-=/QUC
+iD8DBQFFzlUIt2vP6XvVdOcRAv0qAKCKCZsoZdkFDWW0jmS+7BgbSpIDwACg2GPh
+AuOsu3vVdJ9Y7MSoyN71I3w=
+=Abww
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/modprobe.sh b/sys-fs/udev/files/modprobe.sh
index 9a2d9ce8a5d2..278dc3450a07 100755
--- a/sys-fs/udev/files/modprobe.sh
+++ b/sys-fs/udev/files/modprobe.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERBOSE=no
+: ${VERBOSE:=no}
 [[ -e /dev/.udev_populate ]] && VERBOSE=yes
 
 source /sbin/functions.sh </dev/console
@@ -15,7 +15,7 @@ done
 
 # check for blacklisting
 if [[ -f /etc/modprobe.conf ]]; then
-	if grep -q 'blacklist.*[[:space:]]'"${LAST}"'\([[:space:]]\|$\)' /etc/modprobe.conf; then
+	if grep -q '^blacklist.*[[:space:]]'"${LAST}"'\([[:space:]]\|$\)' /etc/modprobe.conf; then
 		# module blacklisted
 		exit 0
 	fi
@@ -23,7 +23,7 @@ fi
 
 if [[ ${VERBOSE} != no ]]; then
 	# print line if not already loaded
-	if ! fgrep -w -q ${LAST} /proc/modules; then
+	if ! grep -q "^${LAST}[[:space:]]" /proc/modules; then
 		einfo "  udev loading module ${LAST}" > /dev/console
 	fi
 fi