ollie-watchdog: simplify, use ollie-remount

This commit is contained in:
Levi Neely 2026-06-15 13:33:09 +02:00
parent 0c95854c73
commit e3dd73ca21
1 changed files with 1 additions and 14 deletions

View File

@ -7,24 +7,11 @@ OLLIE="${OLLIE:-$HOME/mnt/ollie}"
INTERVAL="${OLLIE_WATCHDOG_INTERVAL:-10}"
NAMESPACE="${NAMESPACE:-/tmp/ns.$(id -un).$(echo "${DISPLAY:-:0}" | tr / _)}"
SOCK="$NAMESPACE/ollie"
MOUNT_PID=""
remount() {
if [ -n "$MOUNT_PID" ] && kill -0 "$MOUNT_PID" 2>/dev/null; then
kill "$MOUNT_PID" 2>/dev/null || true
wait "$MOUNT_PID" 2>/dev/null || true
fi
sudo umount -f "$OLLIE" 2>/dev/null || fusermount -u "$OLLIE" 2>/dev/null || true
mkdir -p "$OLLIE"
ollie-9p-mount -u "$(id -un)" -net unix -addr "$SOCK" "$OLLIE" &
MOUNT_PID=$!
logger -t ollie-watchdog "mounted at $OLLIE (pid $MOUNT_PID)"
}
while true; do
if [ -S "$SOCK" ] && ! cat "$OLLIE/help" >/dev/null 2>&1; then
logger -t ollie-watchdog "mount unhealthy, remounting"
remount
ollie-remount 2>/dev/null || true
fi
sleep "$INTERVAL"
done