external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

touchups

Browse source
This commit is contained in:
Jerry Vonau 2025-02-15 15:54:10 -06:00
parent 334d80d579
commit aa8ce5841d
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
roles/usb_lib/files/usbmount/usbmount
View file

@ -90,12 +90,12 @@ if [ "$1" = add ]; then
# Grab device information from device and "divide it" # Grab device information from device and "divide it"
# FIXME: improvement: implement mounting by label (notice that labels # FIXME: improvement: implement mounting by label (notice that labels
# can contain spaces, which makes things a little bit less comfortable). # can contain spaces, which makes things a little bit less comfortable).
DEVINFO=$(/sbin/blkid -p "$DEVNAME") DEVINFO=$(/sbin/blkid -p "/$DEVNAME")
FSTYPE=$(echo "$DEVINFO" | sed 's/.*[[:blank:]]TYPE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;') FSTYPE=$(echo "$DEVINFO" | sed 's/.*[[:blank:]]TYPE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
UUID=$(echo "$DEVINFO" | sed 's/.*[[:blank:]]UUID="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;') UUID=$(echo "$DEVINFO" | sed 's/.*[[:blank:]]UUID="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
USAGE=$(echo "$DEVINFO" | sed 's/.*[[:blank:]]USAGE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;') USAGE=$(echo "$DEVINFO" | sed 's/.*[[:blank:]]USAGE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
if ! echo "$USAGE" | grep -Eq "(filesystem|disklabel)"; then if ! echo "$USAGE" | grep -E "(filesystem|disklabel)"; then
log debug "/$DEVNAME does not contain a filesystem or disklabel" log debug "/$DEVNAME does not contain a filesystem or disklabel"
lockfile-remove /var/run/usbmount/.mount lockfile-remove /var/run/usbmount/.mount
exit exit
@ -206,17 +206,19 @@ if [ "$1" = add ]; then
fi fi
elif [ "$1" = remove ]; then elif [ "$1" = remove ]; then
log debug "DEVNAME is /$DEVNAME"
# A block or partition device has been removed. # A block or partition device has been removed.
# Test if it is mounted. # Test if it is mounted.
while read -r device mountpoint fstype; do while read -r device mountpoint fstype junk; do
if [ "/$DEVNAME" = "$device" ]; then if [ "/$DEVNAME" = "$device" ]; then
log debug "umount device is $device" log debug "umount device is $device"
log debug "umount mountpoint is $mountpoint" log debug "umount fstype is $fstype"
# If the mountpoint and filesystem type are maintained by # If the mountpoint and filesystem type are maintained by
# this script, unmount the filesystem. # this script, unmount the filesystem.
if in_list "$mountpoint" "$MOUNTPOINTS"; then if in_list "$mountpoint" "$MOUNTPOINTS"; then
# Run hook scripts; ignore errors. # Run hook scripts; ignore errors.
export UM_DEVICE="/$DEVNAME" log debug "umount mountpoint is $mountpoint"
export UM_DEVICE="$device"
export UM_MOUNTPOINT="$mountpoint" export UM_MOUNTPOINT="$mountpoint"
export UM_FILESYSTEM="$fstype" export UM_FILESYSTEM="$fstype"
log info "executing command: run-parts /etc/usbmount/umount.d" log info "executing command: run-parts /etc/usbmount/umount.d"