From 0000cdf7bd8a29c30dcdd3ee651ca5f95a2c98bf Mon Sep 17 00:00:00 2001
From: Warren Baker <warren@decoy.co.za>
Date: Fri, 19 Dec 2014 22:37:29 +0200
Subject: [PATCH] Prevent resolvconf(8) from stomping all over our newly
 generated resolv.conf and subsequent updates.

---
 etc/inc/system.inc | 9 +++++++++
 etc/rc             | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index 24638824a4..ba24c88353 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -182,6 +182,15 @@ function system_resolvconf_generate($dynupdate = false) {
 	fwrite($fd, $resolvconf);
 	fclose($fd);
 
+	// Prevent resolvconf(8) from rewriting our resolv.conf
+	$fd = fopen("{$g['varetc_path']}/resolvconf.conf", "w");
+	if (!$fd) {
+		printf("Error: cannot open resolvconf.conf in system_resolvconf_generate().\n");
+		return 1;
+	}
+	fwrite($fd, "resolv_conf=\"/dev/null\"\n");
+	fclose($fd);
+
 	if (!platform_booting()) {
 		/* restart dhcpd (nameservers may have changed) */
 		if (!$dynupdate)
diff --git a/etc/rc b/etc/rc
index 601f3f30cf..52d342df95 100755
--- a/etc/rc
+++ b/etc/rc
@@ -273,6 +273,11 @@ if [ ! -L /etc/resolv.conf ]; then
     /bin/ln -s /var/etc/resolv.conf /etc/resolv.conf
 fi
 
+if [ ! -L /etc/resolvconf.conf ]; then
+    /bin/rm -rf /etc/resolvconf.conf
+    /bin/ln -s /var/etc/resolvconf.conf /etc/resolvconf.conf
+fi
+
 # Setup compatibility link for packages that
 # have trouble overriding the PREFIX configure
 # argument since we build our packages in a