X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=etc%2Finit.d%2Fzfs.lsb;h=ce541a9cd08bbf860b3441f6cdc7a59b86fb418c;hb=7f4afd300b753ee7e0ce1f8d12c098119193001b;hp=a84c1df239207260ef0aa8a30affa151861ad442;hpb=9caef54224f8a0df2fdf6a16bbdf4037ee7e7a50;p=zfs.git

diff --git a/etc/init.d/zfs.lsb b/etc/init.d/zfs.lsb
index a84c1df..ce541a9 100644
--- a/etc/init.d/zfs.lsb
+++ b/etc/init.d/zfs.lsb
@@ -32,8 +32,8 @@ RETVAL=0
 
 LOCKFILE=/var/lock/zfs
 CACHEFILE=/etc/zfs/zpool.cache
-ZPOOL=/usr/sbin/zpool
-ZFS=/usr/sbin/zfs
+ZPOOL=/sbin/zpool
+ZFS=/sbin/zfs
 
 [ -x $ZPOOL ] || exit 1
 [ -x $ZFS ] || exit 2
@@ -50,6 +50,9 @@ start()
 		return 4
 	fi
 
+	# Delay until all required block devices are present.
+	udevadm settle
+
 	# Load the zfs module stack
 	/sbin/modprobe zfs
 
@@ -71,6 +74,10 @@ start()
 		log_begin_msg "Mounting ZFS filesystems"
 		$ZFS mount -a
 		log_end_msg $?
+
+		log_begin_msg "Exporting ZFS filesystems"
+		$ZFS share -a
+		log_end_msg $?
 	fi
 	
 	touch $LOCKFILE