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

moved to usbmount

Browse source
This commit is contained in:
Jerry Vonau 2025-02-15 14:50:45 -06:00
parent a5be0e19d2
commit 0286fed85c
1 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

42
roles/usb_lib/templates/mount.d/70-usb-library.j2
View file

@ -8,39 +8,49 @@
# <douglas@paradise.net.nz> # <douglas@paradise.net.nz>
# #
# by Tim Moody tim@timmoody.com # by Tim Moody tim@timmoody.com
# Jerry Vonau jvonau3@gmail.com
#
# exported from usbmount
# UM_DEVICE="/$DEVNAME"
# UM_MOUNTPOINT="$mountpoint"
# UM_FILESYSTEM="$fstype"
# UM_MOUNTOPTIONS="$options"
# UM_VENDOR="$vendor"
# UM_MODEL="$model"
# UM_MOUNTPOINT is documented at: https://github.com/rbrito/usbmount#hook-scripts
# Better to set this in /etc/usbmount/usbmount.conf # Better to set this in /etc/usbmount/usbmount.conf
# VERBOSE=yes # VERBOSE=yes
# UM_MOUNTPOINT is documented at: https://github.com/rbrito/usbmount#hook-scripts
UM_DEV=$(findmnt -no source $UM_MOUNTPOINT) UM_DEV=$(findmnt -no source $UM_MOUNTPOINT)
# 2022-06-16 better security thanks to @tim-moody and @jvonau: # 2022-06-16 better security thanks to @tim-moody and @jvonau:
# https://github.com/iiab/iiab/pull/3254 # https://github.com/iiab/iiab/pull/3254
LIB_DEV=$(findmnt -no source /library | cut -d '[' -f 1) LIB_DEV=$(findmnt -no source /library | cut -d '[' -f 1)
ROOT_DEV=$(findmnt -no source /) # excluded from mounting in usbmount
BOOT_DEV=$(findmnt -no source /boot) #ROOT_DEV=$(findmnt -no source /)
BOOTFW_DEV=$(findmnt -no source /boot/firmware) #BOOT_DEV=$(findmnt -no source /boot)
#BOOTFW_DEV=$(findmnt -no source /boot/firmware)
# Verbose logging to illuminate occasional boot bugginess: # Verbose logging to illuminate occasional boot bugginess:
logger -t "usb_lib (70-usb-library)" "UM_DEV is: $UM_DEV" logger -t "usb_lib (70-usb-library)" "UM_DEV is: $UM_DEV"
logger -t "usb_lib (70-usb-library)" "LIB_DEV is: $LIB_DEV" logger -t "usb_lib (70-usb-library)" "LIB_DEV is: $LIB_DEV"
logger -t "usb_lib (70-usb-library)" "ROOT_DEV is: $ROOT_DEV" #logger -t "usb_lib (70-usb-library)" "ROOT_DEV is: $ROOT_DEV"
logger -t "usb_lib (70-usb-library)" "BOOT_DEV is: $BOOT_DEV" #logger -t "usb_lib (70-usb-library)" "BOOT_DEV is: $BOOT_DEV"
logger -t "usb_lib (70-usb-library)" "BOOTFW_DEV is: $BOOTFW_DEV" #logger -t "usb_lib (70-usb-library)" "BOOTFW_DEV is: $BOOTFW_DEV"
if [ "$UM_DEV" == "$LIB_DEV" ]; then if [ "$UM_DEV" == "$LIB_DEV" ]; then
logger -t "usb_lib (70-usb-library)" "Skipping $UM_MOUNTPOINT containing /library" logger -t "usb_lib (70-usb-library)" "Skipping $UM_MOUNTPOINT containing /library"
exit 1 exit 1
elif [ "$UM_DEV" == "$ROOT_DEV" ]; then #elif [ "$UM_DEV" == "$ROOT_DEV" ]; then
logger -t "usb_lib (70-usb-library)" "Skipping $UM_MOUNTPOINT containing rootfs" # logger -t "usb_lib (70-usb-library)" "Skipping $UM_MOUNTPOINT containing rootfs"
exit 1 # exit 1
elif [ "$UM_DEV" == "$BOOT_DEV" ]; then #elif [ "$UM_DEV" == "$BOOT_DEV" ]; then
logger -t "usb_lib (70-usb-library)" "Skipping $UM_MOUNTPOINT containing /boot" # logger -t "usb_lib (70-usb-library)" "Skipping $UM_MOUNTPOINT containing /boot"
exit 1 # exit 1
elif [ "$UM_DEV" == "$BOOTFW_DEV" ]; then #elif [ "$UM_DEV" == "$BOOTFW_DEV" ]; then
logger -t "usb_lib (70-usb-library)" "Skipping $UM_MOUNTPOINT containing /boot/firmware" # logger -t "usb_lib (70-usb-library)" "Skipping $UM_MOUNTPOINT containing /boot/firmware"
exit 1 # exit 1
fi fi
# 2025-01-25: Check for existence of folder PUBLIC on USB stick: if found, the stick will not be completely browsable. # 2025-01-25: Check for existence of folder PUBLIC on USB stick: if found, the stick will not be completely browsable.