From: Alexey Shvetsov Date: Tue, 10 May 2011 20:22:35 +0000 (+0400) Subject: Fix zfs.gentoo init script logic X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=commitdiff_plain;h=06abcdd3f44999f694766b22a5fc42d125aa9bef;p=zfs.git Fix zfs.gentoo init script logic * Fix zfs.ko module check * Check 'zfs umount -a' return value --- diff --git a/etc/init.d/zfs.gentoo b/etc/init.d/zfs.gentoo index 5c329ce..1d8ece2 100644 --- a/etc/init.d/zfs.gentoo +++ b/etc/init.d/zfs.gentoo @@ -21,7 +21,7 @@ checksystem() { return 0 else einfo "Checking if ZFS modules present" - if [ -e $(modprobe -l $ZFS_MODULE | grep -q $ZFS_MODULE) ]; then + if [ "x$(modprobe -l $ZFS_MODULE | grep $ZFS_MODULE)" == "x" ]; then eerror "$ZFS_MODULE not found. Is the ZFS package installed?" return 1 fi @@ -94,6 +94,7 @@ stop() { ebegin "Unmounting ZFS filesystems" $ZFS umount -a + rv=$? if [ $rv -ne 0 ]; then eerror "Failed to umount ZFS filesystems." fi