Fix closing monitor before USB drive is connected.

Author: danielskeenan

raspi/CMakeLists.txt

@@ -50,7 +50,7 @@ add_custom_command(OUTPUT ${RASPI5_PKGS}
         sacnlogger_crossbuild_arm64:latest
         cpack -B "./packages" -G DEB
         VERBATIM
-        DEPENDS ${PROJECT_NAME}
+        DEPENDS sacnlogger_monitor ${PROJECT_NAME}
         USES_TERMINAL
         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
 )

raspi/custom/device/sacnlogger-pi5/device/initramfs-tools/scripts/local-bottom/fs.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 # Mount the root filesystem.
-# Based on https://unix.stackexchange.com/a/445141, modified for initramfs-tools and Raspberry Pi.
+# Based on https://unix.stackexchange.com/a/445141, added error handling and modified for initramfs-tools and
+# Raspberry Pi.
 
 PREREQ=""
 prereqs()
@@ -16,10 +17,7 @@ esac
 . /scripts/functions
 # Begin real processing below this line
 
-# Debugging
-set -x
-
-# load module
+# load modules
 modprobe overlay
 if [ $? -ne 0 ]; then
     panic "ERROR: missing overlay kernel module"
@@ -29,7 +27,7 @@ if [ $? -ne 0 ]; then
     panic "ERROR: missing squashfs kernel module"
 fi
 
-log_begin_msg "Setting up tmpfs overlay..."
+log_begin_msg "Mounting root filesystem overlay..."
 
 # create some temporary directories under the initramfs's /run
 # they will be our mountpoints and such, which will get moved
@@ -48,6 +46,7 @@ if [ $? -ne 0 ]; then
 fi
 
 # mount the squashfs and then the overlay to our designated locations
+# The mount command available here doesn't know how to create loopback devices, so need to do it separately.
 losetup /dev/loop0 /run/rootfs/drive/filesystem.squashfs
 if [ $? -ne 0 ]; then
     panic "ERROR: failed to mount compressed filesystem loopback"
@@ -56,17 +55,19 @@ mount -t squashfs -o ro /dev/loop0 /run/rootfs/ro
 if [ $? -ne 0 ]; then
     panic "ERROR: failed to mount compressed filesystem directory"
 fi
+# Now we have both the real filesystem and the tmpfs writable layer, create the overlay.
 mount -t overlay -o lowerdir=/run/rootfs/ro,upperdir=/run/rootfs/rw,workdir=/run/rootfs/.workdir root "${rootmnt}"
 if [ $? -ne 0 ]; then
     panic "ERROR: failed to mount overlay"
 fi
+# At this point we have our overlay root at ${rootmnt}!
 
-# at this point we have our overlay root at ${rootmnt}!
-# move the drive's filesystem mount to where RPI's firmware partition should be mounted.
+# Move the drive's filesystem mount to where RPI's firmware partition should be mounted.
 mkdir -p "${rootmnt}/boot/firmware"
 mount -n -o move /run/rootfs/drive "${rootmnt}/boot/firmware"
 if [ $? -ne 0 ]; then
     panic "ERROR: failed to relocate firmware partition"
 fi
+# Cleanup the scratch dir.
 rm -d /run/rootfs/drive
 log_end_msg

src/sacnlogger_monitor/main.cpp

@@ -21,8 +21,8 @@
 
 #include <argparse/argparse.hpp>
 #include <boost/asio/io_context.hpp>
-#include <boost/process/v2/process.hpp>
 #include <boost/process/v2/environment.hpp>
+#include <boost/process/v2/process.hpp>
 #include <filesystem>
 #include <fmt/format.h>
 #include <fstream>
@@ -66,6 +66,8 @@ bool diskAvailable()
 
 void requestTerm(int) { termRequested = true; }
 
+void cleanup() { spdlog::shutdown(); }
+
 int main(int argc, char* argv[])
 {
     // Arguments
@@ -107,6 +109,11 @@ int main(int argc, char* argv[])
     // Wait for disk to be available.
     while (!diskAvailable())
     {
+        if (termRequested)
+        {
+            cleanup();
+            return EXIT_SUCCESS;
+        }
         std::this_thread::sleep_for(std::chrono::seconds(1));
     }
     // Add monitor log on disk.
@@ -149,7 +156,7 @@ int main(int argc, char* argv[])
         exe.request_exit();
         exe.wait();
     }
-    spdlog::shutdown();
+    cleanup();
 
     return exe.exit_code();
 }