X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=etc%2Finit.d%2Fzfs.gentoo;h=d43a5a06e8c0d7a5f886fb2d8c4648591b34d606;hb=b59322a0d8919cc0ed5982f5a869e9e022645515;hp=1d8ece2c8ce4bd446baaa87cd9f9040b77957e9a;hpb=06abcdd3f44999f694766b22a5fc42d125aa9bef;p=zfs.git

diff --git a/etc/init.d/zfs.gentoo b/etc/init.d/zfs.gentoo
index 1d8ece2..d43a5a0 100644
--- a/etc/init.d/zfs.gentoo
+++ b/etc/init.d/zfs.gentoo
@@ -6,7 +6,7 @@
 depend()
 {
 	before net
-	after udev
+	after udev localmount
 	keyword -lxc -openvz -prefix -vserver
 }
 
@@ -41,6 +41,10 @@ checksystem() {
 start() {
 	ebegin "Starting ZFS"
 	checksystem || return 1
+
+	# Delay until all required block devices are present.
+	udevadm settle
+
 	if [ ! -c /dev/zfs ]; then
 		modprobe $ZFS_MODULE
 		rv=$?
@@ -75,17 +79,6 @@ start() {
 		return $rv
 	fi
 
-	# hack to read mounted file systems because otherwise
-	# zfs returns EPERM when a non-root user reads a mounted filesystem before root did
-	savepwd="$PWD"
-	mount | grep " type zfs " | sed 's/.*on //' | sed 's/ type zfs.*$//' | \
-	while read line
-	do
-		cd "$line" &> /dev/null
-		ls &> /dev/null
-	done
-	cd "$savepwd"
-
 	eend 0
 	return 0
 }