From e23647da77259d827c403fa13d0de5670faa6ff4 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 9 Dec 2016 15:12:24 +0100
Subject: [PATCH] console: fix port assignment on WAN <-> LAN switch; closes
 #1272

---
 src/etc/rc.initial.setports | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/etc/rc.initial.setports b/src/etc/rc.initial.setports
index 88ba0ed7a..e1b8b4f6b 100755
--- a/src/etc/rc.initial.setports
+++ b/src/etc/rc.initial.setports
@@ -41,12 +41,15 @@ require_once("openvpn.inc");
 system_console_mute();
 
 if (set_networking_interfaces_ports()) {
-    echo "Reloading interfaces...";
     global $config;
-    $config = parse_config();
-    interfaces_configure();
-    echo "done.\n";
-    enable_rrd_graphing();
+    $config = parse_config(true);
+
+    /* need to stop local dhcp servers to avoid wrong leases */
+    killbypid("{$g['dhcpd_chroot_path']}/var/run/dhcpd.pid", 'TERM', true);
+    killbypid("{$g['dhcpd_chroot_path']}/var/run/dhcpdv6.pid", 'TERM', true);
+
+    interfaces_configure(true);
+    enable_rrd_graphing(true);
 }
 
 system_console_unmute();