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

mount.d/70-usb-library.j2: move lib/root/boot check above check for PUBLIC dir

Browse source 
Co-authored-by: A Holt <holta@users.noreply.github.com>
This commit is contained in:
avni 2025-01-25 17:04:46 -05:00 • committed by GitHub
parent 341df04d90
commit f9538a4834
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,18 +12,11 @@
VERBOSE=yes VERBOSE=yes
# UM_MOUNTPOINT and UM_DEVICE are documented at: https://github.com/rbrito/usbmount#hook-scripts # UM_MOUNTPOINT and UM_DEVICE are documented at: https://github.com/rbrito/usbmount#hook-scripts
SHARE_DIR=$UM_MOUNTPOINT
if [ -d $UM_MOUNTPOINT/PUBLIC ]; then
SHARE_DIR="$UM_MOUNTPOINT/PUBLIC"
logger -p user.notice -t "usb_lib (70-usb-library)" -- "Found /PUBLIC on $UM_MOUNTPOINT"
else
logger -p user.notice -t "usb_lib (70-usb-library)" -- "Did not find /PUBLIC on $UM_MOUNTPOINT"
fi
LIB_DEV=`findmnt /library | grep / | awk '{print $2}' | awk -F '[' '{print $1}'` LIB_DEV=$(findmnt -no source /library | cut -d '[' -f 1)
ROOT_DEV=`findmnt / | grep / | awk '{print $2}'` ROOT_DEV=$(findmnt -no source /)
BOOT_DEV=`findmnt /boot | grep / | awk '{print $2}'` BOOT_DEV=$(findmnt -no source /boot)
BOOTFW_DEV=`findmnt /boot/firmware | grep / | awk '{print $2}'` BOOTFW_DEV=$(findmnt -no source /boot/firmware)
if [ "$UM_DEVICE" == "$LIB_DEV" ]; then if [ "$UM_DEVICE" == "$LIB_DEV" ]; then
logger -p user.notice -t "usb_lib (70-usb-library)" -- "Skipping $UM_MOUNTPOINT containing /library" logger -p user.notice -t "usb_lib (70-usb-library)" -- "Skipping $UM_MOUNTPOINT containing /library"
exit exit
@ -38,6 +31,14 @@ elif [ "$UM_DEVICE" == "$BOOTFW_DEV" ]; then
exit exit
fi fi
if [ -d $UM_MOUNTPOINT/PUBLIC ]; then
SHARE_DIR=$UM_MOUNTPOINT/PUBLIC
logger -p user.notice -t "usb_lib (70-usb-library)" -- "Found /PUBLIC on $UM_MOUNTPOINT"
else
SHARE_DIR=$UM_MOUNTPOINT
logger -p user.notice -t "usb_lib (70-usb-library)" -- "Did not find /PUBLIC on $UM_MOUNTPOINT"
fi
CONTENT_LINK_USB=`basename $UM_MOUNTPOINT | awk '{print toupper($0)}'` CONTENT_LINK_USB=`basename $UM_MOUNTPOINT | awk '{print toupper($0)}'`
CONTENT_LINK="{{ doc_root }}/local_content/$CONTENT_LINK_USB" CONTENT_LINK="{{ doc_root }}/local_content/$CONTENT_LINK_USB"
logger -p user.notice -t "usb_lib (70-usb-library)" -- "Creating link from $SHARE_DIR to $CONTENT_LINK" logger -p user.notice -t "usb_lib (70-usb-library)" -- "Creating link from $SHARE_DIR to $CONTENT_LINK"