From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 10 Sep 2012 09:48:31 +0000 (+0000)
Subject: block-mount: additionally try to umount disk by mountpoint (#12056)
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=77fe98d1342d957188c81675279e7202e2837f5c;p=openwrt%2Fstaging%2Fnbd.git

block-mount: additionally try to umount disk by mountpoint (#12056)

SVN-Revision: 33357
---

diff --git a/package/block-mount/Makefile b/package/block-mount/Makefile
index b82011fe42..799539e4bd 100644
--- a/package/block-mount/Makefile
+++ b/package/block-mount/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=block-mount
 PKG_VERSION:=0.2.0
-PKG_RELEASE:=8
+PKG_RELEASE:=9
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/block-mount/files/40-mount b/package/block-mount/files/40-mount
index 5118d9c104..f1d63eba66 100644
--- a/package/block-mount/files/40-mount
+++ b/package/block-mount/files/40-mount
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2009-2010 OpenWrt.org
+# Copyright (C) 2009-2012 OpenWrt.org
 # Copyright (C) 2010 Vertical Communications
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -11,6 +11,7 @@ blkdev=`dirname $DEVPATH`
 if [ `basename $blkdev` != "block" ]; then
 
     device=`basename $DEVPATH`
+    mountpoint=`sed -ne "s|^[^ ]*/$device ||; T; s/ .*//p" /proc/self/mounts`
 
     case "$ACTION" in
 	add)
@@ -82,6 +83,7 @@ if [ `basename $blkdev` != "block" ]; then
 		;;
 	remove)
 		umount /dev/$device
+		umount $mountpoint
 		;;
     esac