Kill dhcpleases after we are sure we can write /etc/hosts

1 files changed, 8 insertions, 7 deletions

diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index e7b8609..422f92e 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -499,6 +499,14 @@ function system_hosts_generate() {
 		}
 	}
 
+	$fd = fopen("{$g['varetc_path']}/hosts", "w");
+	if (!$fd) {
+		log_error(gettext(
+		    "Error: cannot open hosts file in system_hosts_generate()."
+		    ));
+		return 1;
+	}
+
 	/*
 	 * Do not remove this because dhcpleases monitors with kqueue it needs
 	 * to be killed before writing to hosts files.
@@ -508,13 +516,6 @@ function system_hosts_generate() {
 		@unlink("{$g['varrun_path']}/dhcpleases.pid");
 	}
 
-	$fd = fopen("{$g['varetc_path']}/hosts", "w");
-	if (!$fd) {
-		log_error(gettext(
-		    "Error: cannot open hosts file in system_hosts_generate()."
-		    ));
-		return 1;
-	}
 	fwrite($fd, $hosts);
 	fclose($fd);