From e08a49332a283174c4be5e095de66ccd2149043c Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 13 Feb 2023 09:02:33 +0100
Subject: [PATCH] interfaces: sync up these changes

Better push 'none' than '' down the code, it is more concise for debugging.
---
 src/etc/rc.newwanip   | 2 +-
 src/etc/rc.newwanipv6 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip
index d8cba3dca..a67470d93 100755
--- a/src/etc/rc.newwanip
+++ b/src/etc/rc.newwanip
@@ -161,7 +161,7 @@ ifgroup_setup();
 
 $cacheip_file = "/tmp/{$device}_oldip";
 $cacheip = trim(@file_get_contents($cacheip_file));
-$intf_ipaddr = $config['interfaces'][$interface]['ipaddr'] ?? '';
+$intf_ipaddr = $config['interfaces'][$interface]['ipaddr'] ?? 'none';
 
 if ($ip != $cacheip || (!is_ipaddr($intf_ipaddr) && $intf_ipaddr != 'dhcp')) {
     system_routing_configure(false, $interface);
diff --git a/src/etc/rc.newwanipv6 b/src/etc/rc.newwanipv6
index 2b5d57664..74dfad2ac 100755
--- a/src/etc/rc.newwanipv6
+++ b/src/etc/rc.newwanipv6
@@ -91,7 +91,7 @@ log_msg("IP renwal starting (new: {$ip}, old: ${cacheip}, interface: {$interface
 
 interfaces_vips_configure($interface, 6);
 
-if ($config['interfaces'][$interface]['ipaddrv6'] == 'slaac') {
+if (($config['interfaces'][$interface]['ipaddrv6'] ?? 'none') == 'slaac') {
     /* require immediate reconfiguration before reconfiguring clients */
     plugins_configure('dhcp', false, ['inet6']);
 }