1From eb87e757e488aea841d73f640483e076a999524b Mon Sep 17 00:00:00 2001 2From: Jeffy Chen <jeffy.chen@rock-chips.com> 3Date: Fri, 17 Jun 2022 15:27:30 +0800 4Subject: [PATCH 5/5] Handle SD card as well 5 6There's no much difference in handling SD card and USB disk. 7 8Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 9--- 10 usbmount | 8 ++++++++ 11 usbmount.conf | 5 +++-- 12 usbmount.rules | 15 ++++++++++----- 13 3 files changed, 21 insertions(+), 7 deletions(-) 14 15diff --git a/usbmount b/usbmount 16index d9a1f0c..4613dac 100755 17--- a/usbmount 18+++ b/usbmount 19@@ -69,6 +69,14 @@ fi 20 21 umask 022 22 23+case "$2" in 24+ usb) 25+ MOUNTPOINTS=${MOUNTPOINTS_USB:-${MOUNTPOINTS}} 26+ ;; 27+ sd) 28+ MOUNTPOINTS=${MOUNTPOINTS_SD:-${MOUNTPOINTS}} 29+ ;; 30+esac 31 32 if [ "$1" = add ]; then 33 34diff --git a/usbmount.conf b/usbmount.conf 35index b265940..98b77eb 100644 36--- a/usbmount.conf 37+++ b/usbmount.conf 38@@ -9,8 +9,9 @@ ENABLED=1 39 # removable storage devices. A newly plugged in device is mounted on 40 # the first directory in this list that exists and on which nothing is 41 # mounted yet. 42-MOUNTPOINTS="/media/usb0 /media/usb1 /media/usb2 /media/usb3 43- /media/usb4 /media/usb5 /media/usb6 /media/usb7" 44+MOUNTPOINTS="/media/storage0 /media/storage1 /media/storage2 /media/storage3" 45+MOUNTPOINTS_SD="/media/sdcard0 /media/sdcard1 /media/sdcard2 /media/sdcard3" 46+MOUNTPOINTS_USB="/media/udisk0 /media/udisk1 /media/udisk2 /media/udisk3" 47 48 # Filesystem types: removable storage devices are only mounted if they 49 # contain a filesystem type which is in this list. 50diff --git a/usbmount.rules b/usbmount.rules 51index 81d657b..b919f12 100644 52--- a/usbmount.rules 53+++ b/usbmount.rules 54@@ -1,7 +1,12 @@ 55 # Rules for USBmount -*- conf -*- 56 57-KERNEL=="sd*", DRIVERS=="sbp2", ACTION=="add", RUN+="/usr/share/usbmount/usbmount add" 58-KERNEL=="sd*", SUBSYSTEM=="block", ACTION=="add", RUN+="/usr/share/usbmount/usbmount add" 59-KERNEL=="ub*", SUBSYSTEM=="block", ACTION=="add", RUN+="/usr/share/usbmount/usbmount add" 60-KERNEL=="sd*", ACTION=="remove", RUN+="/usr/share/usbmount/usbmount remove" 61-KERNEL=="ub*", ACTION=="remove", RUN+="/usr/share/usbmount/usbmount remove" 62+SUBSYSTEM!="block", GOTO="usbmount_end" 63+ACTION=="remove", RUN+="/usr/share/usbmount/usbmount remove" 64+ 65+ACTION!="add", GOTO="usbmount_end" 66+ENV{ID_FS_TYPE}=="", GOTO="usbmount_end" 67+ 68+KERNEL=="mmcblk*", ATTRS{type}=="SD", RUN+="/usr/share/usbmount/usbmount add sd" 69+ENV{ID_BUS}=="usb", RUN+="/usr/share/usbmount/usbmount add usb" 70+ 71+LABEL="usbmount_end" 72-- 732.20.1 74 75