1*4882a593SmuzhiyunFrom 19cb4ac0f2342331ff57489cda565b3d36463fee Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com>
3*4882a593SmuzhiyunDate: Fri, 17 Jun 2022 15:20:58 +0800
4*4882a593SmuzhiyunSubject: [PATCH 4/5] usbmount: Allow unmounting other mountpoints
5*4882a593Smuzhiyun
6*4882a593SmuzhiyunWe're allowed to mount devices(in fstab) on other mountpoints.
7*4882a593Smuzhiyun
8*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
9*4882a593Smuzhiyun---
10*4882a593Smuzhiyun usbmount | 5 ++---
11*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 3 deletions(-)
12*4882a593Smuzhiyun
13*4882a593Smuzhiyundiff --git a/usbmount b/usbmount
14*4882a593Smuzhiyunindex c09a865..d9a1f0c 100755
15*4882a593Smuzhiyun--- a/usbmount
16*4882a593Smuzhiyun+++ b/usbmount
17*4882a593Smuzhiyun@@ -174,10 +174,9 @@ elif [ "$1" = remove ]; then
18*4882a593Smuzhiyun     # Test if it is mounted.
19*4882a593Smuzhiyun     while read device mountpoint fstype remainder; do
20*4882a593Smuzhiyun 	if [ "$DEVNAME" = "$device" ]; then
21*4882a593Smuzhiyun-	    # If the mountpoint and filesystem type are maintained by
22*4882a593Smuzhiyun+	    # If the filesystem type is maintained by
23*4882a593Smuzhiyun 	    # this script, unmount the filesystem.
24*4882a593Smuzhiyun-	    if in_list "$mountpoint" "$MOUNTPOINTS" &&
25*4882a593Smuzhiyun-		in_list "$fstype" "$FILESYSTEMS"; then
26*4882a593Smuzhiyun+	    if in_list "$fstype" "$FILESYSTEMS"; then
27*4882a593Smuzhiyun 		log info "executing command: umount -l $mountpoint"
28*4882a593Smuzhiyun 		umount -l "$mountpoint"
29*4882a593Smuzhiyun
30*4882a593Smuzhiyun--
31*4882a593Smuzhiyun2.20.1
32*4882a593Smuzhiyun
33