X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=initscripts%2Fpl_boot;h=eb233aac8849b3a3a3166c8c8cf03405c19b7cbc;hb=ab12c48e13809375bf18cb6c695293f95cb6b9dd;hp=6541decbe7ede51ff4f3271e449e199fa4aec51e;hpb=fd85a905ec4b0e4810adf053d9bdcd6c22d23f98;p=bootcd.git

diff --git a/initscripts/pl_boot b/initscripts/pl_boot
index 6541dec..eb233aa 100755
--- a/initscripts/pl_boot
+++ b/initscripts/pl_boot
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+### make sure this output shows up in the console
+
+exec 2>&1
+exec > /dev/console
+
+###
+. /etc/init.d/pl_functions
+
 . /tmp/planet.cnf
 
 # Run gpg once to create default options
@@ -105,11 +113,7 @@ while : ; do
 
     if [[ $contact_count != 0 ]]; then
 
-        if [[ $on_backup_server == 1 ]]; then
-            echo $(date "+%H:%M:%S") " pl_boot: attempting to fetch script from backup server in 30s"
-        else
-            echo $(date "+%H:%M:%S") " pl_boot: attempting to fetch script from primary server in 30s"
-        fi
+        echo $(date "+%H:%M:%S") " pl_boot: next attempt in 30s, to fetch script from server at $CONNECT_BOOT_SERVER"
 	/bin/sleep 30
     fi
 
@@ -168,11 +172,6 @@ while : ; do
                     echo $(date "+%H:%M:%S") " we recommend checking your DNS settings.  If you cannot, then "
                     echo $(date "+%H:%M:%S") " please double check your network settings registered at PLC and "
                     echo $(date "+%H:%M:%S") " stored on this Boot Image."
-                    for file in $(ls /etc/sysconfig/network-scripts/ifcfg-eth* /etc/resolv.conf) ; do 
-                        echo $(date "+%H:%M:%S") contents of $file :
-                        cat $file
-                        echo $(date "+%H:%M:%S") end of $file :
-                    done
                 ;;
                 60)
                     echo $(date "+%H:%M:%S") " This error likely indicates that the hardware clock is likely not set "
@@ -188,6 +187,9 @@ while : ; do
                     echo $(date "+%H:%M:%S") " with as much detail as possible."
                 ;;
             esac
+	    # in any case display as much info as we can (see pl_functions)
+	    pl_network_sanity_checks
+	    # retry
             continue
         fi
     elif [ -n "$DISCONNECTED_OPERATION" ]; then