From eca292e5d9a2ae753257633ab9113c225f11a10b Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Fri, 21 Mar 2008 11:02:02 +0000 Subject: Some OS's block on umount -f, so don't use it. --- sh/rc-mount.sh | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/sh/rc-mount.sh b/sh/rc-mount.sh index c7a6ecf8..7fcd3ee9 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 -- cgit v1.2.3