]> git.proxmox.com Git - mirror_zfs-debian.git/commitdiff
Add the /etc/default/zfs import to the init script.
authorDarik Horn <dajhorn@vanadac.com>
Wed, 30 Mar 2011 21:00:45 +0000 (16:00 -0500)
committerDarik Horn <dajhorn@vanadac.com>
Wed, 30 Mar 2011 21:00:45 +0000 (16:00 -0500)
The init script is disabled by default.

debian/zfsutils.zfs.init

index 3b8994b87c79e37f0089ba2fc88ead85413bd81f..7c680dd999235cb4355c060943d9ff16b94b2626 100644 (file)
@@ -14,6 +14,8 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
 . /lib/lsb/init-functions
 . /lib/init/vars.sh
 
+[ -f /etc/default/zfs ] && . /etc/default/zfs
+
 do_start() {
        log_begin_msg "Starting ZFS subsystem..."
 
@@ -105,6 +107,7 @@ do_stop() {
 
 case "$1" in
   start|"")
+       [ -z "$ZFS_MOUNT" ] && exit 0
        do_start
        ;;
   restart|reload|force-reload)
@@ -112,6 +115,7 @@ case "$1" in
        exit 3
        ;;
   stop)
+       [ -z "$ZFS_UNMOUNT" ] && exit 0
        do_stop
        ;;
   *)