🍓 Sync 2026-07-02 20:41:59

daed/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=daed
 PKG_VERSION:=2026.06.14
-PKG_RELEASE:=16
+PKG_RELEASE:=17
 
 PKG_SOURCE:=daed-src-2026.06.14-4e215048068a.tar.gz
 PKG_SOURCE_URL:=https://github.com/kenzok8/openwrt-daede/releases/download/daed-src
@@ -132,6 +132,10 @@ define Package/daed/install
 	$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dae-wing $(1)/usr/bin/daed
+	$(INSTALL_BIN) $(CURDIR)/files/daed-guard $(1)/usr/bin/daed-guard
+
+	$(INSTALL_DIR) $(1)/usr/share/daed
+	$(INSTALL_DATA) $(CURDIR)/files/daed-cleanup.sh $(1)/usr/share/daed/cleanup.sh
 
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) $(CURDIR)/files/daed.config $(1)/etc/config/daed

daed/files/daed-cleanup.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+daed_cleanup_runtime() {
+	local pid
+
+	for pid in $(ip netns pids daens 2>/dev/null); do
+		kill "$pid" 2>/dev/null
+	done
+
+	if [ -n "$(ip netns pids daens 2>/dev/null)" ]; then
+		sleep 1
+		for pid in $(ip netns pids daens 2>/dev/null); do
+			kill -9 "$pid" 2>/dev/null
+		done
+	fi
+
+	if ! ip netns del daens 2>/dev/null; then
+		umount /run/netns/daens 2>/dev/null
+		rm -f /run/netns/daens
+	fi
+
+	ip link del dae0 2>/dev/null || true
+}

daed/files/daed-guard

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+. /usr/share/daed/cleanup.sh
+
+daed_cleanup_runtime
+exec /usr/bin/daed "$@"

daed/files/daed.init

@@ -5,9 +5,11 @@ USE_PROCD=1
 START=99
 
 CONF="daed"
-PROG="/usr/bin/daed"
+PROG="/usr/bin/daed-guard"
 LOG="/var/log/daed/daed.log"
 
+. /usr/share/daed/cleanup.sh
+
 start_service() {
 	config_load "$CONF"
 
@@ -40,19 +42,7 @@ start_service() {
 
 stop_service() {
 	rm -f "$LOG"
-	# kill lingering procs in daens: TERM first, then KILL for stubborn ones
-	for pid in $(ip netns pids daens 2>/dev/null); do kill "$pid" 2>/dev/null; done
-	if [ -n "$(ip netns pids daens 2>/dev/null)" ]; then
-		sleep 1
-		for pid in $(ip netns pids daens 2>/dev/null); do kill -9 "$pid" 2>/dev/null; done
-	fi
-	# cleanup daens netns; ip-full needed for netns, busybox fallback via umount
-	if ! ip netns del daens 2>/dev/null; then
-		umount /run/netns/daens 2>/dev/null
-		rm -f /run/netns/daens
-	fi
-	# clean orphaned dae0
-	ip link del dae0 2>/dev/null || true
+	daed_cleanup_runtime
 }
 
 service_triggers() {