From e2bcb00a345eefbd2a6b5fd4309250921d7677c1 Mon Sep 17 00:00:00 2001 From: Darik Horn Date: Sun, 4 Dec 2011 14:18:28 -0600 Subject: [PATCH] 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 Closes: #371 --- etc/init.d/zfs.lsb.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/etc/init.d/zfs.lsb.in b/etc/init.d/zfs.lsb.in index c781f05f4d93..57aaf1ec60a9 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