git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Source /etc/default/zfs after setting defaults.
[zfs.git]
/
etc
/
init.d
/
zfs.lsb.in
diff --git
a/etc/init.d/zfs.lsb.in
b/etc/init.d/zfs.lsb.in
index
c781f05
..
57aaf1e
100644
(file)
--- 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 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"
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
[ -x $ZPOOL ] || exit 1
[ -x $ZFS ] || exit 2