From 6f582dc708e713f1d5e1c6871657ac726873b4bf Mon Sep 17 00:00:00 2001 From: Alexey Shvetsov Date: Thu, 12 May 2011 14:54:03 -0700 Subject: [PATCH] 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. --- etc/init.d/zfs.fedora | 9 --------- etc/init.d/zfs.gentoo | 11 ----------- 2 files changed, 20 deletions(-) diff --git a/etc/init.d/zfs.fedora b/etc/init.d/zfs.fedora index 8e48efb7b7..69df621e30 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 1d8ece2c8c..c9c5d8502c 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 }