jens/docs-alpha.jayfield.org
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gitea-backup-pull: skip unmount (no error) if another process is busy on WSD2L840

Browse Source 
rc.unassigned umount always does a lazy unmount and reports success
unconditionally, even with an open cwd on the mountpoint - it never
actually refuses on its own. Check with fuser -m first instead, and
just leave the disk mounted if anything is using it.
This commit is contained in:
jens
2026-07-26 17:56:27 +02:00
parent 5b286644db
commit 495613018c
3 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/clients/vlda-01/README.md
+1 -1
View File
@@ -39,7 +39,7 @@ of every script here, so it's worth stating plainly before anything else:
| File here | Deployed path | Purpose |
|---|---|---|
| `user-scripts/gitea-backup-pull/script` | `/boot/config/plugins/user.scripts/scripts/gitea-backup-pull/script` | Pulls new `gitea-dump` archives from `alpha` via the restricted `giteabackup` SFTP account, verifies each one's sha256 checksum, deletes both files on `alpha` only after a confirmed match, prunes its own local retention (30). Resolves and mounts the `WSD2L840` Unassigned Device itself first, and unmounts it again afterward — but only if this run is the one that mounted it, never disturbing a mount it found already in place. See the script's own header comment for the full reasoning. |
| `user-scripts/gitea-backup-pull/script` | `/boot/config/plugins/user.scripts/scripts/gitea-backup-pull/script` | Pulls new `gitea-dump` archives from `alpha` via the restricted `giteabackup` SFTP account, verifies each one's sha256 checksum, deletes both files on `alpha` only after a confirmed match, prunes its own local retention (30). Resolves and mounts the `WSD2L840` Unassigned Device itself first, and unmounts it again afterward — but only if this run is the one that mounted it, never disturbing a mount it found already in place, and only if nothing else is using the disk at that moment (checked via `fuser -m`; `rc.unassigned umount`'s own lazy unmount never refuses on its own, so this script checks first and just leaves it mounted, no error, if something else is still on it). See the script's own header comment for the full reasoning. |
| `user-scripts/gitea-backup-pull/description` | `.../gitea-backup-pull/description` | Shown in the User Scripts UI. |
| `user-scripts/gitea-backup-pull-onboot/script` | `.../gitea-backup-pull-onboot/script` | One-line wrapper: `bash`-invokes the script above. Exists only because `schedule.json` supports one schedule per script *path* — this is how the "also run once at every restart" requirement was added alongside the existing daily `03:30` schedule without disturbing it. |
| `user-scripts/gitea-backup-pull-onboot/description` | `.../gitea-backup-pull-onboot/description` | Shown in the User Scripts UI. |
scripts/clients/vlda-01/user-scripts/gitea-backup-pull/script
+19 -4
View File
@@ -56,11 +56,26 @@ DEL_BATCH=$(mktemp)
cleanup() {
rm -f "$GET_BATCH" "$DEL_BATCH"
if [ "$UD_ALREADY_MOUNTED" = false ]; then
# cd out first - if the shell's own cwd is still on the device
# (it is, after the "cd $LOCAL_DIR" below), umount fails with
# "target is busy"
# cd out first - our own cwd on the device would otherwise
# make the fuser check below always find "something" using it
cd / || true
/usr/local/sbin/rc.unassigned umount "$UD_DEV" >/dev/null 2>&1
# rc.unassigned's umount always does a lazy (-l) unmount and
# reports "success" no matter what - it does NOT refuse or
# error out just because another process still has the
# mountpoint open (verified live: a process with its cwd on
# the device does not stop it, and does not get killed
# either, unless this were a forced "stop array"-style
# unmount, which a single-device call never is). So the only
# way to actually detect and respect another user of the
# disk is to check first, ourselves, and simply not attempt
# the unmount at all if anything is found - no ERROR, just
# leave it mounted for next time.
if fuser -m "$UD_MOUNTPOINT" >/dev/null 2>&1; then
echo "$(date -Is) $UD_MOUNTPOINT still in use by another process - leaving it mounted"
else
/usr/local/sbin/rc.unassigned umount "$UD_DEV" >/dev/null 2>&1
fi
fi
}
trap cleanup EXIT