From 6529ef77efaefb9723d2b20c1c8b1ba839687625 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 11 May 2020 04:26:50 +0200
Subject: [PATCH] interfaces: match IPv6 equivalent

find_interface_ip() is more prone to side effects and
get_interface_ip() is the fallback anyway.
---
 src/etc/rc.newwanip | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip
index af471e3f3..e805ed2d7 100755
--- a/src/etc/rc.newwanip
+++ b/src/etc/rc.newwanip
@@ -50,16 +50,13 @@ log_error("IPv4 renewal is starting on '{$argument}'");
 if (empty($argument)) {
     $interface = 'wan';
     $interface_real = get_real_interface($interface);
-    $ip = get_interface_ip($interface);
 } else {
     $interface = convert_real_interface_to_friendly_interface_name($argument);
     $interface_real = $argument;
-    $ip = find_interface_ip($interface_real);
-    if (empty($ip)) {
-        $ip = get_interface_ip($interface);
-    }
 }
 
+$ip = get_interface_ip($interface);
+
 if (!isset($config['interfaces'][$interface]['enable'])) {
     log_error("Interface '{$interface}' is disabled or empty, nothing to do.");
     return;