Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Source /etc/default/zfs after setting defaults. 

Let the administrator override all script variables by sourcing the
/etc/default/zfs file after the default values are set.

The spelling mistake in the old path name makes it unlikely that this
bug affected any users.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes: #371
This commit is contained in:
Darik Horn 2011-12-04 14:18:28 -06:00 committed by Brian Behlendorf
parent db7c1771da
commit c2d9c41d50
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,16 +25,14 @@
# Source function library. # Source function library.
. /lib/lsb/init-functions . /lib/lsb/init-functions
# Source zfs configuration.
[ -f /etc/defaults/zfs ] && . /etc/defaults/zfs
RETVAL=0
LOCKFILE=/var/lock/zfs LOCKFILE=/var/lock/zfs
ZFS="@sbindir@/zfs" ZFS="@sbindir@/zfs"
ZPOOL="@sbindir@/zpool" ZPOOL="@sbindir@/zpool"
ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache" ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache"
# Source zfs configuration.
[ -r /etc/default/zfs ] && . /etc/default/zfs
[ -x $ZPOOL ] || exit 1 [ -x $ZPOOL ] || exit 1
[ -x $ZFS ] || exit 2 [ -x $ZFS ] || exit 2