X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=etc%2Finit.d%2Fzfs.fedora;h=bfed452ad694884b72d63ea6b0d9087570195b9b;hb=2cf7f52bc42f215d4ef27d0fd75fc1b1417cb841;hp=8e48efb7b7b97450b349c4991c3149e3efabed10;hpb=f5ef7150ead1f6234e18eb3bda0299f34209bbb8;p=zfs.git

diff --git a/etc/init.d/zfs.fedora b/etc/init.d/zfs.fedora
index 8e48efb..bfed452 100644
--- a/etc/init.d/zfs.fedora
+++ b/etc/init.d/zfs.fedora
@@ -126,6 +126,9 @@ start()
                 action $"SELinux ZFS policy required: " /bin/false || return 6
         fi
 
+	# Delay until all required block devices are present.
+	udevadm settle
+
 	# load kernel module infrastructure
 	if ! grep -q zfs /proc/modules ; then
 		action $"Loading kernel ZFS infrastructure: " modprobe zfs || return 5
@@ -155,15 +158,6 @@ start()
 	
 	action $"Mounting ZFS filesystems not yet mounted: " $ZFS mount -a || return 152
 
-	# 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 2>&1
-		ls > /dev/null
-	done
-	cd "$savepwd"
-
 	read_mtab  "^/dev/zd"
 	read_fstab "^/dev/zd"