From cd5e23360ff97e317a2fec851f0047edd06a912c Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 16 Jan 2018 17:58:49 +0100 Subject: [PATCH] rc: show argument for defer, order was wrong PR: https://forum.opnsense.org/index.php?topic=6891.0 --- src/etc/rc.newwanip | 5 ++--- src/etc/rc.newwanipv6 | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip index c7232a4fc..4c553e1b8 100755 --- a/src/etc/rc.newwanip +++ b/src/etc/rc.newwanip @@ -38,14 +38,13 @@ require_once("util.inc"); require_once("system.inc"); require_once("interfaces.inc"); -// Do not process while booting +$argument = isset($argv[1]) ? trim($argv[1]) : ''; + if (file_exists('/var/run/booting')) { log_error("IP renewal ignored during boot on '{$argument}'"); return; } -$argument = isset($argv[1]) ? trim($argv[1]) : ''; - log_error("IP renewal is starting on '{$argument}'"); if (empty($argument)) { diff --git a/src/etc/rc.newwanipv6 b/src/etc/rc.newwanipv6 index bf5d66643..a3e042ab1 100755 --- a/src/etc/rc.newwanipv6 +++ b/src/etc/rc.newwanipv6 @@ -38,14 +38,13 @@ require_once("util.inc"); require_once("system.inc"); require_once("interfaces.inc"); -// Do not process while booting +$argument = isset($argv[1]) ? trim($argv[1]) : ''; + if (file_exists('/var/run/booting')) { log_error("IP renewal ignored during boot on '{$argument}'"); return; } -$argument = isset($argv[1]) ? trim($argv[1]) : ''; - log_error("IP renewal is starting on '{$argument}'"); if (empty($argument)) {