Make Gentoo initscript use modinfo
authorRichard Yao <ryao@cs.stonybrook.edu>
Tue, 3 Apr 2012 04:21:22 +0000 (00:21 -0400)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 3 Apr 2012 17:37:18 +0000 (10:37 -0700)
The -l parameter to modprobe has been removed from the latest upstream
code and this change has entered Gentoo. Using modinfo as a substitute
addresses this.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #636

etc/init.d/zfs.gentoo.in

index 767aba8..957be99 100644 (file)
@@ -19,7 +19,7 @@ ZFS_MODULE=zfs
 checksystem() {
        if [ ! -c /dev/zfs ]; then
                einfo "Checking if ZFS modules present"
-               if [ "x$(modprobe -l  $ZFS_MODULE | grep $ZFS_MODULE)" == "x" ]; then
+               if ! modinfo zfs > /dev/null 2>&1 ; then
                        eerror "$ZFS_MODULE not found. Is the ZFS package installed?"
                        return 1
                fi