c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-17 01:51:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Additional SYSV init script fixes."

Browse Source 
This reverts commit 036391c980.

Because #3509 came just after this commit was accepted and is related
to the original problem the commit was supposed to fix, we need to
solve the problem in another way.

Signed-off-by: Turbo Fredriksson <turbo@bayour.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Turbo Fredriksson 2015-06-19 16:21:30 +02:00 committed by Brian Behlendorf
parent c52fca13a0
commit 216f9d04a6
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
etc/init.d/zfs-functions.in
View File

@ -371,16 +371,13 @@ read_mtab()
# Unset all MTAB_* variables
unset $(env | grep ^MTAB_ | sed 's,=.*,,')
mount | \
grep -E "$match" | \
sed "s,\(.*\) on \(.*\) type .*,\1;\2," | \
while read line; do
mntpnt=$(echo "$line" | sed -e 's,;.*,,' -e 's,/,_,g' \
-e 's,-,_,g' -e 's,\.,_,g' -e 's, ,_,g')
fs=$(echo "$line" | sed 's,.*;,,')
eval export MTAB_$mntpnt="'$fs'"
done
while read -r fs mntpnt fstype opts rest; do
if echo "$fs $mntpnt $fstype $opts" | grep -qE "$match"; then
mntpnt=$(printf '%b\n' "$mntpnt" | sed -e 's,/,_,g' \
-e 's,-,_,g' -e 's,\.,_,g')
eval export MTAB_$mntpnt="$fs"
fi
done < /proc/mounts
}
in_mtab()