Prevent races on resovlconf generation as well by adding a lock.

1 files changed, 6 insertions, 1 deletions

diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index 347de9b..72b2e0d 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -116,9 +116,12 @@ function system_resolvconf_generate($dynupdate = false) {
 		}
 	}
 
+	$dnslock = lock('resolvconf', LOCK_EX);
+
 	$fd = fopen("{$g['varetc_path']}/resolv.conf", "w");
 	if (!$fd) {
 		printf("Error: cannot open resolv.conf in system_resolvconf_generate().\n");
+		unlock($dnslock);
 		return 1;
 	}
 
@@ -148,7 +151,9 @@ function system_resolvconf_generate($dynupdate = false) {
 			}
 		}
 	}
-	
+
+	unlock($dnslock);
+
 	return 0;
 }