From 0dc226b0c9519cf31cf1e8faf3b0080062ee1282 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 24 Jun 2023 09:53:51 +0200
Subject: [PATCH] WireGuard: delayed service update to avoid race condition

---
 emhttp/plugins/dynamix/scripts/update_services | 8 +++-----
 sbin/create_network_ini                        | 5 +----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/emhttp/plugins/dynamix/scripts/update_services b/emhttp/plugins/dynamix/scripts/update_services
index 0b59b9f78..8dc4b3ef2 100755
--- a/emhttp/plugins/dynamix/scripts/update_services
+++ b/emhttp/plugins/dynamix/scripts/update_services
@@ -1,8 +1,6 @@
 #!/bin/bash
-job=/tmp/wgjob.tmp
-reload=/usr/local/emhttp/webGui/scripts/reload_services
+lock=/tmp/atlock.tmp
 
-rm -f $job
-echo "sleep 5;$reload $job"|at -M now 2>/dev/null
+rm -f $lock
+echo "sleep ${1:-1};/usr/local/emhttp/webGui/scripts/reload_services $lock"|at -M now 2>/dev/null
 exit 0
-
diff --git a/sbin/create_network_ini b/sbin/create_network_ini
index 1b9cc2fd3..9cdd051b0 100755
--- a/sbin/create_network_ini
+++ b/sbin/create_network_ini
@@ -11,8 +11,6 @@
 
 ini=/var/local/emhttp/network.ini.new
 cfg=/boot/config/network.cfg
-job=/tmp/atjob.tmp
-reload=/usr/local/emhttp/webGui/scripts/reload_services
 
 declare -A VLANID USE_DHCP IPADDR NETMASK GATEWAY METRIC USE_DHCP6 IPADDR6 NETMASK6 GATEWAY6 PRIVACY6 METRIC6 DESCRIPTION PROTOCOL
 
@@ -222,8 +220,7 @@ done
 /usr/bin/mv $ini ${ini%.*}
 
 # delayed execution
-rm -f $job
-echo "sleep 35;$reload $job"|at -M now 2>/dev/null
+/usr/local/emhttp/webGui/scripts/update_services 35
 
 # send update information
 if [[ -n $interface && -n $data && -e /var/run/nginx.socket ]]; then