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