summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal LUÇI <eri@pfsense.org>2014-12-02 12:59:54 +0100
committerErmal LUÇI <eri@pfsense.org>2014-12-02 12:59:54 +0100
commit3377dc9da6c3e4431ef2b6f727e35b295ec2bf1a (patch)
tree0289aa751ee6ec8c656fb7eb51b500c3516ea21e /etc
parent110967a4ba58aa6ee02dbfd46dbb0fca562f180e (diff)
downloadpfsense-3377dc9da6c3e4431ef2b6f727e35b295ec2bf1a.zip
pfsense-3377dc9da6c3e4431ef2b6f727e35b295ec2bf1a.tar.gz
Preserve exit code lost from s/exit/return/
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/interfaces.inc2
-rwxr-xr-xetc/rc.initial.setlanip4
2 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 45bd189..b2912b7 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -3142,7 +3142,7 @@ function interface_track6_configure($interface = "lan", $wancfg, $linkupevent =
break;
}
- if (!platform_booting() && $linkupevent == false) {
+ if ($linkupevent == false) {
if (!function_exists('services_dhcpd_configure'))
require_once("services.inc");
diff --git a/etc/rc.initial.setlanip b/etc/rc.initial.setlanip
index dd44afc..235db52 100755
--- a/etc/rc.initial.setlanip
+++ b/etc/rc.initial.setlanip
@@ -404,9 +404,9 @@ function console_configure_dhcpd($version = 4) {
}
if (console_configure_dhcpd(4) == 0)
- return;
+ return 0;
if (console_configure_dhcpd(6) == 0)
- return;
+ return 0;
//*****************************************************************************
OpenPOWER on IntegriCloud