diff options
| author | Brian Behlendorf <[email protected]> | 2011-08-22 15:58:54 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2011-08-22 16:01:59 -0700 |
| commit | 1a2e6a635f9ca259c687d062a133fb972c5d84c5 (patch) | |
| tree | c9a9c4c10d50320f4a0792cda5f11ae9ca3096cf | |
| parent | fd1cd4888a197256d18a877c7fcf259e50ccd65f (diff) | |
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 <[email protected]>
Closes #370
| -rw-r--r-- | etc/init.d/zfs.arch.in | 2 | ||||
| -rw-r--r-- | etc/init.d/zfs.fedora.in | 2 | ||||
| -rw-r--r-- | etc/init.d/zfs.gentoo.in | 2 | ||||
| -rw-r--r-- | etc/init.d/zfs.lsb.in | 2 | ||||
| -rw-r--r-- | etc/init.d/zfs.lunar.in | 2 | ||||
| -rw-r--r-- | 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 9fa7cb4bc..de2ea8a2d 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 1583a109e..04f2077ce 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 31a539cc8..767aba8f9 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 675effe0d..c781f05f4 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 22df3d2b5..97384dc83 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 2b48e95e9..ae797c11a 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 |