rc: defer newwanip not exectued during boot

fichtner · fichtner · commit 386938509695 · 2018-01-16T20:10:01.000+01:00
PR: https://forum.opnsense.org/index.php?topic=6891.0
diff --git a/plist b/plist
@@ -140,6 +140,7 @@
 /usr/local/etc/rc.syshook.d/05-beep.stop
 /usr/local/etc/rc.syshook.d/05-update.early
 /usr/local/etc/rc.syshook.d/10-configd.early
+/usr/local/etc/rc.syshook.d/10-newwanip.start
 /usr/local/etc/rc.syshook.d/15-php.early
 /usr/local/etc/rc.syshook.d/20-backup.early
 /usr/local/etc/rc.syshook.d/20-freebsd.start
diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip
@@ -41,7 +41,8 @@ require_once("interfaces.inc");
 $argument = isset($argv[1]) ? trim($argv[1]) : '';
 
 if (file_exists('/var/run/booting')) {
-    log_error("IP renewal ignored during boot on '{$argument}'");
+    log_error("IP renewal deferred during boot on '{$argument}'");
+    file_put_contents('/tmp/newwanip_' . uniqid(), $argument);
     return;
 }
 
diff --git a/src/etc/rc.newwanipv6 b/src/etc/rc.newwanipv6
@@ -41,7 +41,8 @@ require_once("interfaces.inc");
 $argument = isset($argv[1]) ? trim($argv[1]) : '';
 
 if (file_exists('/var/run/booting')) {
-    log_error("IP renewal ignored during boot on '{$argument}'");
+    log_error("IP renewal deferred during boot on '{$argument}'");
+    file_put_contents('/tmp/newwanipv6_' . uniqid(), $argument);
     return;
 }
 
diff --git a/src/etc/rc.syshook.d/10-newwanip.start b/src/etc/rc.syshook.d/10-newwanip.start
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+for IPV4 in $(find /tmp -type f -name "newwanip_*"); do
+	/usr/local/opnsense/service/configd_ctl.py interface newip $(cat "${IPV4}")
+	rm "${IPV4}"
+done
+
+for IPV6 in $(find /tmp -type f -name "newwanipv6_*"); do
+	/usr/local/opnsense/service/configd_ctl.py interface newipv6 $(cat "${IPV6}")
+	rm "${IPV6}"
+done

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,8 @@ require_once("interfaces.inc");`
`41`	`41`	`$argument = isset($argv[1]) ? trim($argv[1]) : '';`
`42`	`42`
`43`	`43`	`if (file_exists('/var/run/booting')) {`
`44`		`- log_error("IP renewal ignored during boot on '{$argument}'");`
	`44`	`+ log_error("IP renewal deferred during boot on '{$argument}'");`
	`45`	`+ file_put_contents('/tmp/newwanip_' . uniqid(), $argument);`
`45`	`46`	`return;`
`46`	`47`	`}`
`47`	`48`