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:
parent
db7c1771da
commit
c2d9c41d50
|
@ -25,16 +25,14 @@
|
|||
# Source function library.
|
||||
. /lib/lsb/init-functions
|
||||
|
||||
# Source zfs configuration.
|
||||
[ -f /etc/defaults/zfs ] && . /etc/defaults/zfs
|
||||
|
||||
RETVAL=0
|
||||
|
||||
LOCKFILE=/var/lock/zfs
|
||||
ZFS="@sbindir@/zfs"
|
||||
ZPOOL="@sbindir@/zpool"
|
||||
ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache"
|
||||
|
||||
# Source zfs configuration.
|
||||
[ -r /etc/default/zfs ] && . /etc/default/zfs
|
||||
|
||||
[ -x $ZPOOL ] || exit 1
|
||||
[ -x $ZFS ] || exit 2
|
||||
|
||||
|
|
Loading…
Reference in New Issue