X-Git-Url: http://git.onelab.eu/?p=bootcd.git;a=blobdiff_plain;f=initscripts%2Fpl_netinit;h=9a6283054fdc71cafa96babdc0369f45c1b217a5;hp=3f253a2fd00dfac5df3814e6204b4c6bc9dafd78;hb=911d3179f14ae29a192558c744c281cefd764f38;hpb=26ba67b0e7e85044927d4c0ffbf08c44cb86497c

diff --git a/initscripts/pl_netinit b/initscripts/pl_netinit
index 3f253a2..9a62830 100755
--- a/initscripts/pl_netinit
+++ b/initscripts/pl_netinit
@@ -350,6 +350,27 @@ echo $(date "+%H:%M:%S") " pl_netinit: attempting to start networking"
 
 echo $(date "+%H:%M:%S") " pl_netinit: network online"
 
+# patch for f22 - if /etc/resolv.conf is empty in static mode
+function pl_netinit_patch_resolv_conf () {
+    file=/etc/resolv.conf
+    needed=""
+    # missing file : patch needed
+    if ! [ -f $file ]; then
+	needed=true
+    # empty file : patch needed
+    elif cmp $file /dev/null; then
+	needed=true
+    fi
+    if [ -n "$needed" ]; then
+	echo pl_netinit patching $file
+	source /etc/sysconfig/network-scripts/ifcfg-${ETH_DEVICE}
+	( [ -n "$DNS1" ] && echo nameserver $DNS1; \
+	  [ -n "$DNS2" ] && echo nameserver $DNS2 ) > $file
+    else
+	echo pl_netinit has no need to patch $file
+    fi
+    }
+
 function pl_netinit_forensics () {
 
     echo "-------------------- BEG post pl_netinit forensics"
@@ -383,4 +404,6 @@ function pl_netinit_forensics () {
     echo "-------------------- END post pl_netinit forensics"
 }
 
+pl_netinit_patch_resolv_conf
+
 pl_netinit_forensics