summaryrefslogtreecommitdiff
path: root/sh
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-03-21 11:02:02 +0000
committerRoy Marples <roy@marples.name>2008-03-21 11:02:02 +0000
commiteca292e5d9a2ae753257633ab9113c225f11a10b (patch)
treee2c9fc89d37d20507db32e307a5fbe802fcbe9a9 /sh
parentfe90a548b547fd87643e3dc1ab87fbb45dc94456 (diff)
downloadopenrc-eca292e5d9a2ae753257633ab9113c225f11a10b.tar.gz
openrc-eca292e5d9a2ae753257633ab9113c225f11a10b.tar.bz2
openrc-eca292e5d9a2ae753257633ab9113c225f11a10b.tar.xz
Some OS's block on umount -f, so don't use it.
Diffstat (limited to 'sh')
-rw-r--r--sh/rc-mount.sh17
1 files changed, 2 insertions, 15 deletions
diff --git a/sh/rc-mount.sh b/sh/rc-mount.sh
index c7a6ecf..7fcd3ee 100644
--- a/sh/rc-mount.sh
+++ b/sh/rc-mount.sh
@@ -54,22 +54,9 @@ do_unmount()
retry=$((${retry} - 1))
;;
esac
-
- # OK, try forcing things
- if [ ${retry} -le 0 ]; then
- case "${cmd}" in
- umount*)
- LC_ALL=C ${cmd} -f "${mnt}" \
- || retry=-999
- ;;
- *)
- retry=-999
- ;;
- esac
- break
- fi
+ [ ${retry} -le 0 ] && break
done
- if [ ${retry} -eq -999 ]; then
+ if [ ${retry} -le 0 ]; then
eend 1
retval=1
else