summaryrefslogtreecommitdiffstats
path: root/etc/init.d
diff options
context:
space:
mode:
authorDarik Horn <[email protected]>2011-12-04 14:18:28 -0600
committerBrian Behlendorf <[email protected]>2011-12-05 09:51:20 -0800
commitc2d9c41d5084db354d80c03fea4fb0bb97327c0a (patch)
treef425ae0ae676efd9de09a5548c0c298949258e7c /etc/init.d
parentdb7c1771da2634af4e2a4323759656c7f0afe689 (diff)
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 <[email protected]> Closes: #371
Diffstat (limited to 'etc/init.d')
-rw-r--r--etc/init.d/zfs.lsb.in8
1 files changed, 3 insertions, 5 deletions
diff --git a/etc/init.d/zfs.lsb.in b/etc/init.d/zfs.lsb.in
index c781f05f4..57aaf1ec6 100644
--- a/etc/init.d/zfs.lsb.in
+++ b/etc/init.d/zfs.lsb.in
@@ -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