From dbe52eeaa9c17ec56a22ff6cefcf6b94615bd8b4 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 16 Feb 2024 08:15:23 +0100
Subject: [PATCH] wireguard: may end up setting up in interface reconfigure
 when down was forced by carp

---
 .../scripts/Wireguard/wg-service-control.php         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/opnsense/scripts/Wireguard/wg-service-control.php b/src/opnsense/scripts/Wireguard/wg-service-control.php
index c06b1181c..b57924461 100755
--- a/src/opnsense/scripts/Wireguard/wg-service-control.php
+++ b/src/opnsense/scripts/Wireguard/wg-service-control.php
@@ -82,7 +82,6 @@ function wg_start($server, $fhandle, $ifcfgflag = 'up')
     if (!empty((string)$server->mtu)) {
         mwexecf('/sbin/ifconfig %s mtu %s', [$server->interface, $server->mtu]);
     }
-    mwexecf('/sbin/ifconfig %s %s', [$server->interface, $ifcfgflag]);
 
     if (empty((string)$server->disableroutes)) {
         /**
@@ -137,15 +136,18 @@ function wg_start($server, $fhandle, $ifcfgflag = 'up')
         mwexecf('/sbin/route -q -n add %s %s -iface %s', [$ipprefix, $server->gateway, $server->interface]);
     }
 
+    if ($reload) {
+        interfaces_restart_by_device(false, [(string)$server->interface]);
+    }
+
+    mwexecf('/sbin/ifconfig %s %s', [$server->interface, $ifcfgflag]);
+
     // flush checksum to ease change detection
     fseek($fhandle, 0);
     ftruncate($fhandle, 0);
     fwrite($fhandle, @md5_file($server->cnfFilename) . "|" . wg_reconfigure_hash($server));
-    syslog(LOG_NOTICE, "wireguard instance {$server->name} ({$server->interface}) started");
 
-    if ($reload) {
-        interfaces_restart_by_device(false, [(string)$server->interface]);
-    }
+    syslog(LOG_NOTICE, "wireguard instance {$server->name} ({$server->interface}) started");
 }
 
 /**