summaryrefslogtreecommitdiffstats
path: root/src/etc/rc.newwanip
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2016-03-10 19:11:42 -0600
committerChris Buechler <cmb@pfsense.org>2016-03-10 19:12:19 -0600
commit80d3cf1cdd79517cad7676813641d2e0fe73b445 (patch)
tree4bdad87a94cf61abc7e2bf1fc637fe3841170615 /src/etc/rc.newwanip
parentc0367cb8ad43be01a9156a8409c6024d243e3121 (diff)
downloadpfsense-80d3cf1cdd79517cad7676813641d2e0fe73b445.zip
pfsense-80d3cf1cdd79517cad7676813641d2e0fe73b445.tar.gz
Doesn't seem to be any reason rc.newwanip should skip things while the system is booting. Ticket #5952
Diffstat (limited to 'src/etc/rc.newwanip')
-rwxr-xr-xsrc/etc/rc.newwanip15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip
index 5bc6a61..4831043 100755
--- a/src/etc/rc.newwanip
+++ b/src/etc/rc.newwanip
@@ -85,9 +85,7 @@ if (empty($argument)) {
}
}
-if (!platform_booting()) {
- log_error("rc.newwanip: on (IP address: {$curwanip}) (interface: {$interface_descr}[{$interface}]) (real interface: {$interface_real}).");
-}
+log_error("rc.newwanip: on (IP address: {$curwanip}) (interface: {$interface_descr}[{$interface}]) (real interface: {$interface_real}).");
/*
* NOTE: Take care of openvpn, no-ip or similar interfaces if you generate the event to reconfigure an interface.
@@ -118,10 +116,8 @@ if (file_exists("{$g['vardb_path']}/{$interface}_cacheip")) {
$oldip = file_get_contents("{$g['vardb_path']}/{$interface}_cacheip");
}
-/* regenerate resolv.conf if DNS overrides are allowed */
-if (!platform_booting()) {
- system_resolvconf_generate(true);
-}
+/* regenerate resolv.conf */
+system_resolvconf_generate(true);
/* write the current interface IP to file */
if (is_ipaddr($curwanip)) {
@@ -153,11 +149,6 @@ if (!empty($bridgetmp)) {
interface_bridge_add_member($bridgetmp, $interface_real);
}
-// Do not process while booting
-if (platform_booting()) {
- return;
-}
-
/* make new hosts file */
system_hosts_generate();
OpenPOWER on IntegriCloud