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

diff --git a/initscripts/pl_netinit b/initscripts/pl_netinit
index b652674..9a62830 100755
--- a/initscripts/pl_netinit
+++ b/initscripts/pl_netinit
@@ -350,23 +350,60 @@ echo $(date "+%H:%M:%S") " pl_netinit: attempting to start networking"
 
 echo $(date "+%H:%M:%S") " pl_netinit: network online"
 
-echo "BEG post pl_netinit forensics"
-
-file=/root/.ssh/authorized_keys
-echo "$file"
-if ! [ -f "$file" ]; then
-    echo "!!!!!!!!!! missing $file"
-else
-    echo "---------- $file"
-    cat $file
-fi
+# 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
+    }
 
-file="/etc/ssh/sshd_config"    
-if ! [ -f "$file" ]; then
-    echo "!!!!!!!!!! missing $file"
-else
-    echo '---------- egrep Pass|Auth|PAM' $file
-    egrep 'Pass|Auth|PAM' $file
-fi
+function pl_netinit_forensics () {
+
+    echo "-------------------- BEG post pl_netinit forensics"
+
+    file=/root/.ssh/authorized_keys
+    echo "$file"
+    if ! [ -f "$file" ]; then
+	echo "!!!!!!!!!! missing $file"
+    else
+	echo "---------- $file"
+	cat $file
+    fi
+
+    file="/etc/ssh/sshd_config"    
+    if ! [ -f "$file" ]; then
+	echo "!!!!!!!!!! missing $file"
+    else
+	echo '---------- egrep Pass|Auth|PAM|Root' $file
+	grep -v '^#' $file | egrep 'Pass|Auth|PAM|Root'
+    fi
+
+    # on f22 we see an emty resolv.conf...
+    file=/etc/resolv.conf
+    if ! [ -f "$file" ]; then
+	echo "!!!!!!!!!! missing $file"
+    else
+	echo "---------- $file"
+	cat $file
+    fi
+    
+    echo "-------------------- END post pl_netinit forensics"
+}
+
+pl_netinit_patch_resolv_conf
 
-echo "END post pl_netinit forensics"
+pl_netinit_forensics