Linux compat 2.6.39: mount_nodev()

[zfs.git] / etc / init.d / zfs.fedora

diff --git a/etc/init.d/zfs.fedora b/etc/init.d/zfs.fedora
index 8e48efb..bfed452 100644 (file)
--- 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"