Skip to content

Commit

Permalink
Source /etc/default/zfs after setting defaults.
Browse files Browse the repository at this point in the history
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: openzfs#371
  • Loading branch information
Darik Horn authored and Rudd-O committed Feb 1, 2012
1 parent 42c12e9 commit e2bcb00
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions etc/init.d/zfs.lsb.in
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit e2bcb00

Please sign in to comment.