From dad2abdb724b6bfbef27da3fd2885c0502963705 Mon Sep 17 00:00:00 2001
From: Brennan Kinney <5098581+polarathene@users.noreply.github.com>
Date: Thu, 16 May 2024 12:57:13 +1200
Subject: [PATCH] fix: Properly implement fix

---
 target/scripts/startup/setup.d/getmail.sh    | 4 ++++
 target/scripts/startup/setup.d/mail_state.sh | 7 +++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/target/scripts/startup/setup.d/getmail.sh b/target/scripts/startup/setup.d/getmail.sh
index 6f280118..c6cda386 100644
--- a/target/scripts/startup/setup.d/getmail.sh
+++ b/target/scripts/startup/setup.d/getmail.sh
@@ -31,6 +31,10 @@ function _setup_getmail() {
 EOF
       chmod -R 600 "${GETMAILRC}"
     fi
+
+    # Both the debug command and cron job (that runs getmail) for getmail
+    # expect this location to exist. As does the `/var/mail-state` startup script.
+    mkdir -p /var/lib/getmail
   else
     _log 'debug' 'Getmail is disabled'
   fi
diff --git a/target/scripts/startup/setup.d/mail_state.sh b/target/scripts/startup/setup.d/mail_state.sh
index 4a86b873..e819c138 100644
--- a/target/scripts/startup/setup.d/mail_state.sh
+++ b/target/scripts/startup/setup.d/mail_state.sh
@@ -70,14 +70,13 @@ function _setup_save_states() {
         rm -rf "${SERVICEDIR}"
       elif [[ -d ${SERVICEDIR} ]]; then
         _log 'trace' "Moving contents of ${SERVICEDIR} to ${DEST}"
-        # An empty volume was mounted, or new content exists from enabling a feature ENV:
-        # Ensure the original directory exists before mv, otherwise with nothing to move
-        # the symlink created afterwards is invalid.
-        mkdir -p "${SERVICEDIR}"
+        # An empty volume was mounted, or new content dir now exists from enabling a feature ENV:
         mv "${SERVICEDIR}" "${DEST}"
         # Apply SELinux security context to match the state directory, so access
         # is not restricted to the current running container:
         chcon -R --reference="${STATEDIR}" "${DEST}" 2>/dev/null || true
+      else
+        _log 'error' "${SERVICEDIR} should exist but is missing"
       fi
 
       # Symlink the original path in the container ($SERVICEDIR) to be