Really restart DHCPD server after changes

1 files changed, 9 insertions, 3 deletions

diff --git a/etc/rc.initial.setlanip b/etc/rc.initial.setlanip
index 34112a0..24497bf 100755
--- a/etc/rc.initial.setlanip
+++ b/etc/rc.initial.setlanip
@@ -106,6 +106,7 @@
 				$intip = "dhcp";
 				$intbits = "";
 				$isintdhcp = true;
+				$restart_dhcpd = true;
 			} 
 		}
 		
@@ -121,11 +122,11 @@
 		  		echo "e.g. 255.255.255.0 = 24\n";
 		  		echo "     255.255.0.0   = 16\n";
 		  		echo "     255.0.0.0     = 8\n";
-	
 		  		do {
 					$upperifname = strtoupper($interface);
 		  			echo "\n" . gettext("Enter the new {$upperifname} IPv4 subnet bit count:") . "\n> ";
 		  			$intbits = chop(fgets($fp));
+					$restart_dhcpd = true;
 		  		} while (!is_numeric($intbits) || ($intbits < 1) || ($intbits > 31));
 		  	} 
 		}
@@ -158,7 +159,7 @@
 				exit(0);
 			}
 		} while (!(is_ipaddr($dhcpendip)));
-
+		$restart_dhcpd = true;
 		$config['dhcpd'][$interface]['enable'] = true;
 		$config['dhcpd'][$interface]['range']['from'] = $dhcpstartip;
 		$config['dhcpd'][$interface]['range']['to'] = $dhcpendip;
@@ -168,8 +169,9 @@
 		  number */
 		if($config['dhcpd'][$interface]) 
 			unset($config['dhcpd'][$interface]['enable']);
-			
+		echo "Disabling DHCPD...";
 		services_dhcpd_configure();
+		echo "Done!\n";
 	}
 
 	if ($config['system']['webgui']['protocol'] == "https") {
@@ -213,6 +215,10 @@
 	echo " Reloading filter...";
 	filter_configure_sync();
 	echo "\n";
+	if($restart_dhcpd) {
+		echo " DHCPD..."; 
+		services_dhcpd_configure();
+	}
 	
 	if ($intip != '') {
 		if (is_ipaddr($intip)) {