Fixes #837. Fix the startup of dhcpleases during bootup. Also start the dhcpd service earlier there is not reason no to!

2 files changed, 14 insertions, 5 deletions

diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index 058629a..3578ee7 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -227,6 +227,14 @@ function system_hosts_generate() {
 	fwrite($fd, $hosts);
 	fclose($fd);
 
+	system_dhcpleases_configure();
+
+	return 0;
+}
+
+function system_dhcpleases_configure() {
+	global $configure, $g;
+
 	/* Start the monitoring process for dynamic dhcpclients. */
 	if (isset($config['dnsmasq']['regdhcp'])) {
 		/* Make sure we do not error out */
@@ -239,8 +247,6 @@ function system_hosts_generate() {
                 sigkillbypid("{$g['varrun_path']}/dhcpleases.pid", "TERM");
                 @unlink("{$g['varrun_path']}/dhcpleases.pid");
         }
-
-	return 0;
 }
 
 function system_hostname_configure() {
diff --git a/etc/rc.bootup b/etc/rc.bootup
index f150b80..38310b4 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -295,9 +295,15 @@ mwexec_bg("/usr/local/sbin/ntpdate_sync_once.sh");
 if (is_ipaddr($config['interfaces']['wan']['ipaddr']))
 	services_dnsupdate_process();
 
+/* start DHCP service */
+services_dhcpd_configure();
+
 /* start dnsmasq service */
 services_dnsmasq_configure();
 
+/* start dhcpleases dhpcp hosts leases program */
+system_dhcpleases_configure();
+
 /* start dyndns service */
 @touch("{$g['tmp_path']}/update_dyndns");
 
@@ -334,9 +340,6 @@ filter_configure_sync();
 /* load graphing functions */
 enable_rrd_graphing();
 
-/* start DHCP service */
-services_dhcpd_configure();
-
 /* startup OLSR if needed */
 setup_wireless_olsr();