- if grep -q $MNTPOINT /proc/mounts ; then
- # make sure nothing is left inside chroot so we can unmount it
- [ -x "$MNTPOINT"/etc/init.d/ssh ] && "$MNTPOINT"/etc/init.d/ssh stop
- [ -x "$MNTPOINT"/etc/init.d/mdadm ] && "$MNTPOINT"/etc/init.d/mdadm stop
- # ugly, but make sure we really don't leave anything (/proc /proc is intended)
- for ARG in /sys /proc /proc ; do
- [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount $ARG >/dev/null 2>&1 || true
- done
- umount "$MNTPOINT"/dev >/dev/null 2>&1 || true
-
- [ -d "$MNTPOINT/$ISODIR" ] && umount "$MNTPOINT/$ISODIR" >/dev/null 2>&1 || true
-
- if [ -n "$DIRECTORY" ] ; then
- einfo "Not unmounting $MNTPOINT as you requested me to install into a directory of your own choice." ; eend 0
- else
- einfo "Unmounting $MNTPOINT" ; umount "$MNTPOINT" ; eend $?
- fi
-
- if [ -n "$STAGES" ] ; then
- echo -n "Removing stages directory ${STAGES}: "
- rm -rf "$STAGES" && echo done
- fi
-
- # remove directory only if we used the default with process id inside the name
- if echo "$MNTPOINT" | grep -q '/mnt/debootstrap\.' ; then
- einfo "Removing directory ${MNTPOINT}" ; rmdir $MNTPOINT ; eend $?
- fi
- fi
+ if grep -q "$MNTPOINT" /proc/mounts ; then
+ # make sure nothing is left inside chroot so we can unmount it
+ [ -x "$MNTPOINT"/etc/init.d/ssh ] && "$MNTPOINT"/etc/init.d/ssh stop
+ [ -x "$MNTPOINT"/etc/init.d/mdadm ] && "$MNTPOINT"/etc/init.d/mdadm stop
+
+ [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount -a >/dev/null 2>&1
+
+ # ugly, but make sure we really don't leave anything (/proc /proc and
+ # /dev /dev are intended, trying to work around timing issues, see #657023)
+ for ARG in /sys /proc /proc /dev /dev ; do
+ [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount $ARG >/dev/null 2>&1
+ umount "$MNTPOINT"/$ARG >/dev/null 2>&1
+ done
+
+ if [ -n "$ISODIR" ] ; then
+ [ -d "$MNTPOINT/$ISODIR" ] && umount "$MNTPOINT/$ISODIR" >/dev/null 2>&1
+ fi
+
+ if [ -n "$DIRECTORY" ] ; then
+ einfo "Not unmounting $MNTPOINT as you requested me to install into a directory of your own choice." ; eend 0
+ else
+ einfo "Unmounting $MNTPOINT"
+ umount "$MNTPOINT"
+ eend $?
+ fi
+
+ if [ -n "$STAGES" ] ; then
+ echo -n "Removing stages directory ${STAGES}: "
+ rm -rf "$STAGES" && echo done
+ fi
+
+ # remove directory only if we used the default with process id inside the name
+ if echo "$MNTPOINT" | grep -q '/mnt/debootstrap\.' ; then
+ einfo "Removing directory ${MNTPOINT}"
+ rmdir "$MNTPOINT"
+ eend $?
+ fi
+ fi