From e8947f2712b72ef2a9bb9c047b1bb4acf84de9f4 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 10 May 2023 09:36:20 +0200
Subject: [PATCH] interfaces: simplify dhcp6c renew script

---
 src/etc/inc/interfaces.inc | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index de73a9acb..4a0af8db0 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -2787,12 +2787,10 @@ function interface_dhcpv6_prepare($interface, $wancfg, $cleanup = false)
 
     $dhcp6cscript = <<<EOF
 #!/bin/sh
-if [ -n "{$dhcp6_debug}" ]; then
-    /usr/bin/logger -t dhcp6c "dhcp6c \$REASON on {$wanif}"
-fi
+
 case \$REASON in
 INFOREQ|REQUEST)
-    /usr/bin/logger -t dhcp6c "dhcp6c \$REASON on {$wanif} - running newipv6"
+    /usr/bin/logger -t dhcp6c "dhcp6c \$REASON on {$wanif}"
     ARGS=
     for NAMESERVER in \${new_domain_name_servers}; do
         ARGS="\${ARGS} -a \${NAMESERVER}"
@@ -2811,13 +2809,16 @@ INFOREQ|REQUEST)
     /usr/local/sbin/configctl -d interface newipv6 {$wanif} \${FORCE}
     ;;
 EXIT|RELEASE)
-    /usr/bin/logger -t dhcp6c "dhcp6c \$REASON on {$wanif} - running newipv6"
+    /usr/bin/logger -t dhcp6c "dhcp6c \$REASON on {$wanif}"
     /usr/local/sbin/ifctl -i ${wanif} -6nd
     /usr/local/sbin/ifctl -i ${wanif} -6sd
     /usr/local/sbin/ifctl -i ${wanif} -6pd
     /usr/local/sbin/configctl -d interface newipv6 {$wanif}
     ;;
 *)
+    if [ -n "{$dhcp6_debug}" ]; then
+        /usr/bin/logger -t dhcp6c "dhcp6c \$REASON on {$wanif}"
+    fi
     ;;
 esac