From a3fad5924362ade93f2e4710def540dcd0da94e7 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.davis@inf.org>
Date: Mon, 3 Nov 2014 22:28:46 +0545
Subject: Fixup dhcpd interface enabled check

---
 etc/rc.initial.setlanip | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'etc')

diff --git a/etc/rc.initial.setlanip b/etc/rc.initial.setlanip
index be07a7e..49c70e2 100755
--- a/etc/rc.initial.setlanip
+++ b/etc/rc.initial.setlanip
@@ -395,10 +395,7 @@ function console_configure_dhcpd($version = 4) {
 		$config[$dhcpd][$interface]['range']['from'] = $dhcpstartip;
 		$config[$dhcpd][$interface]['range']['to'] = $dhcpendip;
 	} else {
-		/* TODO - this line is causing a "Fatal error: Cannot unset
-		   string offsets in /etc/rc.initial.setlanip" on below line
-		   number - Nov 2014 - is it really? */
-		if($config[$dhcpd][$interface]) {
+		if(isset($config[$dhcpd][$interface]['enable'])) {
 			unset($config[$dhcpd][$interface]['enable']);
 			printf(gettext("Disabling %s DHCPD..."), $label_IPvX);
 			$restart_dhcpd = true;
-- 
cgit v1.1