diff options
| author | Alexey Shvetsov <[email protected]> | 2011-05-12 14:54:03 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2011-05-12 15:01:35 -0700 |
| commit | 6f582dc708e713f1d5e1c6871657ac726873b4bf (patch) | |
| tree | e6f5074ca3c8a4305606fec519939fc9f65fec4b | |
| parent | 06abcdd3f44999f694766b22a5fc42d125aa9bef (diff) | |
Remove root 'ls' after mount workaround
This workaround was introduced to workaround issue #164. This
issue was fixed by commit 5f35b19 so the workaround can be safely
dropped from both the zfs.fedora and zfs.gentoo init scripts.
| -rw-r--r-- | etc/init.d/zfs.fedora | 9 | ||||
| -rw-r--r-- | etc/init.d/zfs.gentoo | 11 |
2 files changed, 0 insertions, 20 deletions
diff --git a/etc/init.d/zfs.fedora b/etc/init.d/zfs.fedora index 8e48efb7b..69df621e3 100644 --- a/etc/init.d/zfs.fedora +++ b/etc/init.d/zfs.fedora @@ -155,15 +155,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" diff --git a/etc/init.d/zfs.gentoo b/etc/init.d/zfs.gentoo index 1d8ece2c8..c9c5d8502 100644 --- a/etc/init.d/zfs.gentoo +++ b/etc/init.d/zfs.gentoo @@ -75,17 +75,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 } |