From: Darik Horn <dajhorn@vanadac.com>
Date: Sun, 4 Dec 2011 20:18:28 +0000 (-0600)
Subject: Source /etc/default/zfs after setting defaults.
X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=commitdiff_plain;h=c2d9c41d5084db354d80c03fea4fb0bb97327c0a;p=zfs.git

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
---

diff --git a/etc/init.d/zfs.lsb.in b/etc/init.d/zfs.lsb.in
index c781f05..57aaf1e 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