c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-17 01:51:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect zpool_cache substitution

Browse Source 
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
This commit is contained in:
Brian Behlendorf 2011-08-22 15:58:54 -07:00
parent fd1cd4888a
commit 1a2e6a635f
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/init.d/zfs.arch.in
View File

@ -5,7 +5,7 @@
ZFS="@sbindir@/zfs" ZFS="@sbindir@/zfs"
ZPOOL="@sbindir@/zpool" ZPOOL="@sbindir@/zpool"
ZPOOL_CACHE="@initdir@/zpool.cache" ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache"
case "$1" in case "$1" in
start) start)

2
etc/init.d/zfs.fedora.in
View File

@ -32,7 +32,7 @@ export PATH=/usr/local/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin
RETVAL=0 RETVAL=0
ZFS="@sbindir@/zfs" ZFS="@sbindir@/zfs"
ZPOOL="@sbindir@/zpool" ZPOOL="@sbindir@/zpool"
ZPOOL_CACHE="@initdir@/zpool.cache" ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache"
servicename=zfs servicename=zfs
LOCKFILE=/var/lock/subsys/$servicename LOCKFILE=/var/lock/subsys/$servicename

2
etc/init.d/zfs.gentoo.in
View File

@ -13,7 +13,7 @@ depend()
ZFS="@sbindir@/zfs" ZFS="@sbindir@/zfs"
ZPOOL="@sbindir@/zpool" ZPOOL="@sbindir@/zpool"
ZPOOL_CACHE="@initdir@/zpool.cache" ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache"
ZFS_MODULE=zfs ZFS_MODULE=zfs
checksystem() { checksystem() {

2
etc/init.d/zfs.lsb.in
View File

@ -33,7 +33,7 @@ RETVAL=0
LOCKFILE=/var/lock/zfs LOCKFILE=/var/lock/zfs
ZFS="@sbindir@/zfs" ZFS="@sbindir@/zfs"
ZPOOL="@sbindir@/zpool" ZPOOL="@sbindir@/zpool"
ZPOOL_CACHE="@initdir@/zpool.cache" ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache"
[ -x $ZPOOL ] || exit 1 [ -x $ZPOOL ] || exit 1
[ -x $ZFS ] || exit 2 [ -x $ZFS ] || exit 2

2
etc/init.d/zfs.lunar.in
View File

@ -12,7 +12,7 @@
ZFS="@sbindir@/zfs" ZFS="@sbindir@/zfs"
ZPOOL="@sbindir@/zpool" ZPOOL="@sbindir@/zpool"
ZPOOL_CACHE="@initdir@/zpool.cache" ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache"
case $1 in case $1 in
start) echo "$1ing ZFS filesystems" start) echo "$1ing ZFS filesystems"

2
etc/init.d/zfs.redhat.in
View File

@ -32,7 +32,7 @@ export PATH=/usr/local/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin
RETVAL=0 RETVAL=0
ZFS="@sbindir@/zfs" ZFS="@sbindir@/zfs"
ZPOOL="@sbindir@/zpool" ZPOOL="@sbindir@/zpool"
ZPOOL_CACHE="@initdir@/zpool.cache" ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache"
servicename=zfs servicename=zfs
LOCKFILE=/var/lock/subsys/$servicename LOCKFILE=/var/lock/subsys/$servicename