From 2ce9d0ec61706e56abd4c56fe78bfe11365ad130 Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Tue, 3 Apr 2012 00:21:22 -0400 Subject: 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 Closes #636 --- etc/init.d/zfs.gentoo.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'etc/init.d') diff --git a/etc/init.d/zfs.gentoo.in b/etc/init.d/zfs.gentoo.in index 767aba8f9..957be99ae 100644 --- a/etc/init.d/zfs.gentoo.in +++ b/etc/init.d/zfs.gentoo.in @@ -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 -- cgit v1.2.3