From 1a2e6a635f9ca259c687d062a133fb972c5d84c5 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 22 Aug 2011 15:58:54 -0700 Subject: [PATCH] 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 Closes #370 --- etc/init.d/zfs.arch.in | 2 +- etc/init.d/zfs.fedora.in | 2 +- etc/init.d/zfs.gentoo.in | 2 +- etc/init.d/zfs.lsb.in | 2 +- etc/init.d/zfs.lunar.in | 2 +- etc/init.d/zfs.redhat.in | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/etc/init.d/zfs.arch.in b/etc/init.d/zfs.arch.in index 9fa7cb4..de2ea8a 100644 --- 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 1583a10..04f2077 100644 --- 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 31a539c..767aba8 100644 --- 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 675effe..c781f05 100644 --- 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 22df3d2..97384dc 100644 --- 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 2b48e95..ae797c1 100644 --- 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 -- 1.8.3.1