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.
This commit is contained in:
parent
06abcdd3f4
commit
6f582dc708
|
@ -155,15 +155,6 @@ start()
|
||||||
|
|
||||||
action $"Mounting ZFS filesystems not yet mounted: " $ZFS mount -a || return 152
|
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_mtab "^/dev/zd"
|
||||||
read_fstab "^/dev/zd"
|
read_fstab "^/dev/zd"
|
||||||
|
|
||||||
|
|
|
@ -75,17 +75,6 @@ start() {
|
||||||
return $rv
|
return $rv
|
||||||
fi
|
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
|
eend 0
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue