From a2bc696f4d60fc201e784ae2a4a8d999797265a5 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sat, 15 Feb 2025 14:55:48 -0600 Subject: [PATCH] logging --- roles/usb_lib/templates/mount.d/70-usb-library.j2 | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/roles/usb_lib/templates/mount.d/70-usb-library.j2 b/roles/usb_lib/templates/mount.d/70-usb-library.j2 index e77092fce..e133b6bb5 100644 --- a/roles/usb_lib/templates/mount.d/70-usb-library.j2 +++ b/roles/usb_lib/templates/mount.d/70-usb-library.j2 @@ -22,6 +22,7 @@ # Better to set this in /etc/usbmount/usbmount.conf # VERBOSE=yes +logger -t "usbmount - usb_lib (70-usb-library)" "UM_MOUNTPOINT is: $UM_MOUNTPOINT" UM_DEV=$(findmnt -no source $UM_MOUNTPOINT) # 2022-06-16 better security thanks to @tim-moody and @jvonau: @@ -33,14 +34,14 @@ LIB_DEV=$(findmnt -no source /library | cut -d '[' -f 1) #BOOTFW_DEV=$(findmnt -no source /boot/firmware) # 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)" "LIB_DEV is: $LIB_DEV" +logger -t "usbmount - usb_lib (70-usb-library)" "UM_DEV is: $UM_DEV" +logger -t "usbmount - 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)" "BOOT_DEV is: $BOOT_DEV" #logger -t "usb_lib (70-usb-library)" "BOOTFW_DEV is: $BOOTFW_DEV" if [ "$UM_DEV" == "$LIB_DEV" ]; then - logger -t "usb_lib (70-usb-library)" "Skipping $UM_MOUNTPOINT containing /library" + logger -t "usbmount - usb_lib (70-usb-library)" "Skipping $UM_MOUNTPOINT containing /library" exit 1 #elif [ "$UM_DEV" == "$ROOT_DEV" ]; then # logger -t "usb_lib (70-usb-library)" "Skipping $UM_MOUNTPOINT containing rootfs" @@ -58,20 +59,20 @@ fi # "public artwork" — as summarized here: https://github.com/iiab/iiab/blob/master/roles/usb_lib/README.rst if [ -d $UM_MOUNTPOINT/PUBLIC ]; then SHARE_DIR=$UM_MOUNTPOINT/PUBLIC - logger -t "usb_lib (70-usb-library)" "Found /PUBLIC on $UM_MOUNTPOINT" + logger -t "usbmount - usb_lib (70-usb-library)" "Found /PUBLIC on $UM_MOUNTPOINT" else SHARE_DIR=$UM_MOUNTPOINT - logger -t "usb_lib (70-usb-library)" "Did not find /PUBLIC on $UM_MOUNTPOINT" + logger -t "usbmount - usb_lib (70-usb-library)" "Did not find /PUBLIC on $UM_MOUNTPOINT" fi CONTENT_LINK_USB=$(basename $UM_MOUNTPOINT | awk '{print toupper($0)}') if [ -z "$CONTENT_LINK_USB" ]; then - logger -t "usb_lib (70-usb-library)" 'ERROR: Var CONTENT_LINK_USB is empty ("rm -rf /library/www/html/local_content/" would be dangerous!)' + logger -t "usbmount - usb_lib (70-usb-library)" 'ERROR: Var CONTENT_LINK_USB is empty ("rm -rf /library/www/html/local_content/" would be dangerous!)' exit 1 fi CONTENT_LINK="{{ doc_root }}/local_content/$CONTENT_LINK_USB" # 'rm -rf' even stronger than 'ln -nsf' and 'ln -Tsf' # https://serverfault.com/questions/147787/how-to-update-a-symbolic-link-target-ln-f-s-not-working/522483#522483 -logger -t "usb_lib (70-usb-library)" "Creating link from $CONTENT_LINK to $SHARE_DIR" +logger -t "usbmount - usb_lib (70-usb-library)" "Creating link from $CONTENT_LINK to $SHARE_DIR" rm -rf $CONTENT_LINK ln -s $SHARE_DIR $CONTENT_LINK