From: Michael Prokop <mika@grml.org>
Date: Wed, 5 Sep 2012 09:21:14 +0000 (+0200)
Subject: blacklist: replace 'modprobe -l' command with modinfo(8) command line
X-Git-Tag: v2.2.1~3
X-Git-Url: http://git.grml.org/?p=grml-scripts.git;a=commitdiff_plain;h=c6b45f3850ddfb5726f0d3e02de8194ef4e52bd0

blacklist: replace 'modprobe -l' command with modinfo(8) command line

Thanks kmod for deprecating 'modprobe -l'.
---

diff --git a/usr_sbin/blacklist b/usr_sbin/blacklist
index ff9f2d0..03b624d 100755
--- a/usr_sbin/blacklist
+++ b/usr_sbin/blacklist
@@ -25,12 +25,17 @@ fi
 
 if [ "$PN" = 'blacklist' ] ; then
   if grep -q "^blacklist $1\$" $MODPROBEFILE ; then
-     eerror "Module $1 already on blacklist in $MODPROBEFILE" ; eend 1
+    eerror "Module $1 already on blacklist in $MODPROBEFILE" ; eend 1
   else
     einfo "Adding module $1 to blacklist $MODPROBEFILE"
+
+    if ! modinfo "${1}" >/dev/null 2>&1 ; then
+      ewarn "Notice: module $1 does not seem to exist. Adding anyway."
+      eend 0
+    fi
+
     echo "blacklist $1" >> $MODPROBEFILE
     echo "alias $1 off" >> $MODPROBEFILE ; eend $?
-    modprobe -l | grep -q "${1}.ko" || ( ewarn "Notice: module $1 does not seem to exist. Adding anyway." ; eend 0 )
   fi
 fi