From e3dd73ca21690fba1e09c566872b050f43788cc7 Mon Sep 17 00:00:00 2001
From: Levi Neely <lneely@pascom.net>
Date: Mon, 15 Jun 2026 13:33:09 +0200
Subject: [PATCH] ollie-watchdog: simplify, use ollie-remount

---
 scripts/s/ollie-watchdog | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/scripts/s/ollie-watchdog b/scripts/s/ollie-watchdog
index d307080..01585e0 100755
--- a/scripts/s/ollie-watchdog
+++ b/scripts/s/ollie-watchdog
@@ -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