From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 26 Aug 2015 12:13:43 +0000 (+0200)
Subject: fiz patch : resolv.conf as elaborated by systemd in /run looks like a special file
X-Git-Tag: bootcd-5.3-2~1
X-Git-Url: http://git.onelab.eu/?p=bootcd.git;a=commitdiff_plain;h=900c82bd7693bb3edbf367cbeebb049bd5ac3075

fiz patch : resolv.conf as elaborated by systemd in /run looks like a special file
we can only overwrite the genuine file in /etc/resolv.conf, not the symlink
---

diff --git a/initscripts/pl_netinit b/initscripts/pl_netinit
index 9a62830..9102d91 100755
--- a/initscripts/pl_netinit
+++ b/initscripts/pl_netinit
@@ -364,6 +364,9 @@ function pl_netinit_patch_resolv_conf () {
     if [ -n "$needed" ]; then
 	echo pl_netinit patching $file
 	source /etc/sysconfig/network-scripts/ifcfg-${ETH_DEVICE}
+	# delete because it's a symlink to /run/systemd/resolve/resolv.conf
+	# which looks really weird (ls -lL /etc/resolv.conf does not show anything)
+	rm $file
 	( [ -n "$DNS1" ] && echo nameserver $DNS1; \
 	  [ -n "$DNS2" ] && echo nameserver $DNS2 ) > $file
     else