Permalink
Browse files

Make Gentoo initscript use modinfo

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
  • Loading branch information...
1 parent 847de12 commit 2ce9d0ec61706e56abd4c56fe78bfe11365ad130 @ryao ryao committed with behlendorf Apr 3, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 etc/init.d/zfs.gentoo.in
View
@@ -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

0 comments on commit 2ce9d0e

Please sign in to comment.