From 3b75682f3110d4b19e08255274d57c997735e5fc Mon Sep 17 00:00:00 2001
From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Fri, 25 Jan 2008 20:43:36 +0000
Subject: [PATCH] Simplify network file setup.

---
 plc.d/network | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/plc.d/network b/plc.d/network
index 141bc50..3022e39 100755
--- a/plc.d/network
+++ b/plc.d/network
@@ -51,34 +51,13 @@ case "$1" in
 	chmod +r $target
 	rm -f $hfile
 
-	rfile=$(mktemp)
 	# Set up nameservers
 	(
+	    echo "; generated by /etc/plc.d/network"
 	    [ -n "$PLC_NET_DNS1" ] && echo "nameserver $PLC_NET_DNS1"
 	    [ -n "$PLC_NET_DNS2" -a "$PLC_NET_DNS1" != "$PLC_NET_DNS2" ] && echo "nameserver $PLC_NET_DNS2"
-	) > $rfile
-
-	if [ $PLC_DNS_ENABLED -eq 1 ] ; then
-	    target=/etc/plc_resolv.conf
-
-	    r2file=$(mktemp)
-	    echo "; generated by /etc/plc.d/network" >$r2file
-	    if [ -n "${!PLC_BOOT_IP}" ] ; then
-		echo "nameserver ${!PLC_BOOT_IP}" >>$r2file
-	    else
-		    ip=$(gethostbyname ${!PLC_BOOT_HOST})
-		    if [ -n "$ip" ] ; then
-			echo "nameserver $ip" >>$r2file
-		    fi
-	    fi
-	    changed=$(diff $r2file /etc/resolv.conf)
-	    [ $changed -ne 0 ] && cp /etc/resolv.conf /etc/resolv.conf.bak
-	    mv $r2file /etc/resolv.conf
-	else
-	    target=/etc/resolv.conf
-	fi
-	mv $rfile $target
-	chmod +r $target
+	) > /etc/resolv.conf
+	chmod +r /etc/resolv.conf
 
 	result "$MESSAGE"
 	;;
-- 
2.47.0