summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Doty <kingtaco@gentoo.org>2005-03-11 23:11:05 +0000
committerMike Doty <kingtaco@gentoo.org>2005-03-11 23:11:05 +0000
commitb9f5c930e41a53a7916a03e7a9bf47819ad8a326 (patch)
tree6ffb366743b01d71db6e28b0484c94ba6d3760b3 /eclass/linux-mod.eclass
parentPruned old version. (diff)
downloadgentoo-2-b9f5c930e41a53a7916a03e7a9bf47819ad8a326.tar.gz
gentoo-2-b9f5c930e41a53a7916a03e7a9bf47819ad8a326.tar.bz2
gentoo-2-b9f5c930e41a53a7916a03e7a9bf47819ad8a326.zip
linux-mod.eclass: fixed grep in update_modules() so it's not a subshell, and doesn't output when no files are found
Diffstat (limited to 'eclass/linux-mod.eclass')
-rw-r--r--eclass/linux-mod.eclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass
index 6d996414712c..f0a5cbbf7b0e 100644
--- a/eclass/linux-mod.eclass
+++ b/eclass/linux-mod.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.30 2005/03/08 21:41:31 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.31 2005/03/11 23:11:05 kingtaco Exp $
# Description: This eclass is used to interface with linux-info in such a way
# to provide the functionality required and initial functions
@@ -134,8 +134,8 @@ update_depmod() {
}
update_modules() {
- if [ -x /sbin/modules-update -a \
- -n "$(grep -v -e "^#" -e "^$" ${D}/etc/modules.d/*)" ] ; then
+ if [ -x /sbin/modules-update ] && \
+ grep -v -e "^#" -e "^$" ${D}/etc/modules.d/* >/dev/null 2>&1; then
ebegin "Updating modules.conf"
/sbin/modules-update
eend $?