From ab12c48e13809375bf18cb6c695293f95cb6b9dd Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 9 Mar 2015 09:02:06 +0100
Subject: [PATCH] previous commit works fine, so just a bit of cleanup

---
 initscripts/pl_boot    |  5 +----
 initscripts/pl_netinit | 32 +++++++++++++++++++-------------
 initscripts/pl_sysinit |  5 +----
 initscripts/pl_wrapper | 10 ----------
 prep.sh                |  2 +-
 5 files changed, 22 insertions(+), 32 deletions(-)
 delete mode 100755 initscripts/pl_wrapper

diff --git a/initscripts/pl_boot b/initscripts/pl_boot
index 417a183..eb233aa 100755
--- a/initscripts/pl_boot
+++ b/initscripts/pl_boot
@@ -1,12 +1,9 @@
 #!/bin/bash
 
-### xxx tmp debug
+### make sure this output shows up in the console
 
-set -x
-echo pl_boot on console > /dev/console
 exec 2>&1
 exec > /dev/console
-echo pl_boot plain
 
 ###
 . /etc/init.d/pl_functions
diff --git a/initscripts/pl_netinit b/initscripts/pl_netinit
index 9e895c7..d795033 100755
--- a/initscripts/pl_netinit
+++ b/initscripts/pl_netinit
@@ -61,6 +61,17 @@ DEFAULT_NET_CONF=0
 function net_init_failed() {
     echo
     echo $(date "+%H:%M:%S") " pl_netinit: network initialization failed,"
+    echo
+    echo For forensics
+    echo
+    echo ========== lspci beg
+    /sbin/lspci -n | /bin/grep "Class 0200"    
+    echo ========== lspci end
+    echo
+    echo ========== ifconfig beg
+    /sbin/ifconfig
+    echo ========== ifconfig end
+    echo 
     echo $(date "+%H:%M:%S") " pl_netinit: shutting down machine in two hours"
     /bin/sleep 2h
     /sbin/shutdown -h now
@@ -286,22 +297,24 @@ if [[ -z "$ETH_DEVICE" ]]; then
 fi
 
 # within a systemd-driven startup, we often see this stage
-# triggered before the network is actually up
+# triggered before the network interface is actually exposed
+# by udev/kernel
 # although of course we have network-online.target
 # as a requirement; go figure what systemd actually does..
 
 # in any case, let us try to work around that by allowing some delay
 # here
 
-TIMEOUT=30
+ALLOW=5
+COUNTER=0
 while true; do
     if /sbin/ifconfig $ETH_DEVICE >& /dev/null; then
-	echo Device $ETH_DEVICE found - proceeding - timeout=$TIMEOUT
+	echo "pl_netinit: device present $ETH_DEVICE, proceeding (${COUNTER}s/${ALLOW}s)"
 	break
     fi
-    echo $(date "+%H:%M:%S") " pl_netinit: waiting for device $ETH_DEVICE, ${TIMEOUT}s remaining "
-    TIMEOUT=$(($TIMEOUT-1))
-    [ $TIMEOUT -le 0 ] && net_init_failed
+    echo $(date "+%H:%M:%S") " pl_netinit: waiting for device $ETH_DEVICE,${COUNTER}s/${ALLOW}s"
+    COUNTER=$(($COUNTER+1))
+    [ $COUNTER -ge 0 ] && net_init_failed
     sleep 1
 done
 
@@ -313,13 +326,6 @@ done
     echo $(date "+%H:%M:%S") " pl_netinit: this CD does not have hardware support for your"
     echo $(date "+%H:%M:%S") " pl_netinit: network adapter. please send the following lines"
     echo $(date "+%H:%M:%S") " pl_netinit: to your PlanetLab support for further assistance"
-    echo ========== lspci beg
-    /sbin/lspci -n | /bin/grep "Class 0200"    
-    echo ========== lspci end
-    echo ========== ifconfig beg
-    /sbin/ifconfig
-    echo ========== ifconfig beg
-
     net_init_failed
 }
 
diff --git a/initscripts/pl_sysinit b/initscripts/pl_sysinit
index 389f8b6..85282b5 100755
--- a/initscripts/pl_sysinit
+++ b/initscripts/pl_sysinit
@@ -1,12 +1,9 @@
 #!/bin/sh
 
-### xxx tmp debug
+### make sure this output shows up in the console
 
-set -x
-echo pl_sysinit on console > /dev/console
 exec 2>&1
 exec > /dev/console
-echo pl_sysinit plain
 
 ###
 . /etc/init.d/pl_functions
diff --git a/initscripts/pl_wrapper b/initscripts/pl_wrapper
deleted file mode 100755
index a46b9f5..0000000
--- a/initscripts/pl_wrapper
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-#
-# nodes starting up with fedora18 - especially under kvm/qemu btw
-# tend to startup unreliably, this is an attempt to get more details by
-# * running pl_boot and pl_sysinit in -x mode
-# * and logging everything in /var/log/ as well as echoing in /dev/console
-#
-# also we just run both in sequence instead of relying on convoluted systemd dependencies
-# 
-(bash -x /etc/init.d/pl_sysinit ; bash -x /etc/init.d/pl_boot) 2>&1 | tee /var/log/bootcd.log > /dev/console
diff --git a/prep.sh b/prep.sh
index 05a7a69..0d0a872 100755
--- a/prep.sh
+++ b/prep.sh
@@ -60,7 +60,7 @@ install -D -m 755 ipnmac/ipnmac.x86 $bootcd/usr/sbin/ipnmac
 
 # Install initscripts
 echo "* Installing initscripts"
-for file in pl_functions pl_sysinit pl_hwinit pl_netinit pl_validateconf pl_boot pl_wrapper ; do
+for file in pl_functions pl_sysinit pl_hwinit pl_netinit pl_validateconf pl_boot ; do
     sed -i -e "s,@PLDISTRO@,$pldistro,g" -e "s,@FCDISTRO@,$fcdistro,g" initscripts/$file
     install -D -m 755 initscripts/$file $bootcd/etc/init.d/$file
 done
-- 
2.43.0