move killall dhcpd above section that exits if no DHCP servers are enabled, and configure dhcpd if it's disabled by option #2 at the console.

Ticket #1867 (cvstrac)

1 files changed, 4 insertions, 4 deletions

diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index bd1e75b..6175a17 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -42,6 +42,10 @@ function services_dhcpd_configure() {
 		$mt = microtime();
 		echo "services_dhcpd_configure($if) being called $mt\n";
 	}
+	
+	/* kill any running dhcpd */
+	if(is_process_running("dhcpd"))
+		mwexec("killall dhcpd", true);
 
 	/* DHCP enabled on any interfaces? */
 	if (!is_dhcp_server_enabled())
@@ -73,10 +77,6 @@ function services_dhcpd_configure() {
 	fclose($fd);
 	mwexec("/bin/sh /tmp/dhcpd.sh");
 
-	/* kill any running dhcpd */
-	if(is_process_running("dhcpd"))
-		mwexec("killall dhcpd", true);
-
 	$syscfg = $config['system'];
 	$dhcpdcfg = $config['dhcpd'];
 	$Iflist = get_configured_interface_list();