Fix incorrect zpool_cache substitution

This regression was accidentally introduced by commit aa2b489.
I was attempting to simplify the init scripts and accidentally
confused the /etc/init.d and /etc/zfs paths.  This change reverts
the init script modifications.

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

diff --git a/etc/init.d/zfs.arch.in b/etc/init.d/zfs.arch.in
index 9fa7cb4bc8647a0bb7df23832a6eddc78f9e9496..de2ea8a2d91da096a62e7b7f39af90d0c4bf1da1 100644 (file)
--- a/etc/init.d/zfs.arch.in
+++ b/etc/init.d/zfs.arch.in
@@ -5,7 +5,7 @@
 
 ZFS="@sbindir@/zfs"
 ZPOOL="@sbindir@/zpool"
-ZPOOL_CACHE="@initdir@/zpool.cache"
+ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache"
 
 case "$1" in
   start)

diff --git a/etc/init.d/zfs.fedora.in b/etc/init.d/zfs.fedora.in
index 1583a109e0aa67caa37e6c2c8ec175fad8709c67..04f2077ceb418e36283efdb83a09a4fc27347f66 100644 (file)
--- a/etc/init.d/zfs.fedora.in
+++ b/etc/init.d/zfs.fedora.in
@@ -32,7 +32,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
 

diff --git a/etc/init.d/zfs.gentoo.in b/etc/init.d/zfs.gentoo.in
index 31a539cc852f5049bd486900023aa227f0de2d42..767aba8f96a27d346806f63627229bdbd0b9be2d 100644 (file)
--- a/etc/init.d/zfs.gentoo.in
+++ b/etc/init.d/zfs.gentoo.in
@@ -13,7 +13,7 @@ depend()
 
 ZFS="@sbindir@/zfs"
 ZPOOL="@sbindir@/zpool"
-ZPOOL_CACHE="@initdir@/zpool.cache"
+ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache"
 ZFS_MODULE=zfs
 
 checksystem() {

diff --git a/etc/init.d/zfs.lsb.in b/etc/init.d/zfs.lsb.in
index 675effe0d8a07b562947b6169d245bda4333069d..c781f05f4d939280dd8461168fb0680ea8272e46 100644 (file)
--- a/etc/init.d/zfs.lsb.in
+++ b/etc/init.d/zfs.lsb.in
@@ -33,7 +33,7 @@ RETVAL=0
 LOCKFILE=/var/lock/zfs
 ZFS="@sbindir@/zfs"
 ZPOOL="@sbindir@/zpool"
-ZPOOL_CACHE="@initdir@/zpool.cache"
+ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache"
 
 [ -x $ZPOOL ] || exit 1
 [ -x $ZFS ] || exit 2

diff --git a/etc/init.d/zfs.lunar.in b/etc/init.d/zfs.lunar.in
index 22df3d2b5acaba53161cb7a41db0c7a2d1813c9a..97384dc833aa5ea02d5d891e4b9df2851988e92d 100644 (file)
--- a/etc/init.d/zfs.lunar.in
+++ b/etc/init.d/zfs.lunar.in
@@ -12,7 +12,7 @@
 
 ZFS="@sbindir@/zfs"
 ZPOOL="@sbindir@/zpool"
-ZPOOL_CACHE="@initdir@/zpool.cache"
+ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache"
 
 case $1 in
   start)  echo "$1ing ZFS filesystems"

diff --git a/etc/init.d/zfs.redhat.in b/etc/init.d/zfs.redhat.in
index 2b48e95e90f30a550df9c8c3d5bbfd25b8d67e16..ae797c11a5c28d8aa3436c03eba81bdb9aca8e61 100644 (file)
--- a/etc/init.d/zfs.redhat.in
+++ b/etc/init.d/zfs.redhat.in
@@ -32,7 +32,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