X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=etc%2Finit.d%2Fzfs.redhat.in;h=fb5187f05292eef9108e81c3cb35e0d1971befc3;hb=e013670550641610dc09b6b58f0ea9fd00169d07;hp=2b48e95e90f30a550df9c8c3d5bbfd25b8d67e16;hpb=aa2b4896c93bbb2652ddc5e10e66175e54ff56c8;p=zfs.git

diff --git a/etc/init.d/zfs.redhat.in b/etc/init.d/zfs.redhat.in
index 2b48e95..fb5187f 100644
--- a/etc/init.d/zfs.redhat.in
+++ b/etc/init.d/zfs.redhat.in
@@ -25,6 +25,11 @@
 
 export PATH=/usr/local/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin
 
+if [ -z "$init" ]; then
+    # Not interactive
+    grep -Eqi 'zfs=off|zfs=no' /proc/cmdline && exit 3
+fi
+
 # Source function library & LSB routines
 . /etc/rc.d/init.d/functions
 
@@ -32,7 +37,7 @@ export PATH=/usr/local/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin
 RETVAL=0
 ZFS="@sbindir@/zfs"
 ZPOOL="@sbindir@/zpool"
-ZPOOL_CACHE="@initdir@/zpool.cache"
+ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache"
 servicename=zfs
 LOCKFILE=/var/lock/subsys/$servicename