X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=initscripts%2Fpl_boot;h=931af20a8eb0414d7a0094da8549a490875f933d;hb=df194cf6f2046316ce227d0933b1f50ddd28088c;hp=690fbd0bc743c03f5726a78ee25101a9cc568dcb;hpb=07ef1881f6d33c0d966406816b8bdc58f2cfa33d;p=bootcd.git

diff --git a/initscripts/pl_boot b/initscripts/pl_boot
index 690fbd0..931af20 100755
--- a/initscripts/pl_boot
+++ b/initscripts/pl_boot
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+. /etc/init.d/pl_functions
+
 . /tmp/planet.cnf
 
 # Run gpg once to create default options
@@ -20,11 +22,11 @@ ATTEMPTS_BEFORE_BACKUP=3
 BOOT_DIR=/usr/boot/
 
 # get the server we are going to be contacting
-BOOT_SERVER=`cat $BOOT_DIR/boot_server`
-BOOT_SERVER_PORT=`cat $BOOT_DIR/boot_server_port`
+BOOT_SERVER=$(cat $BOOT_DIR/boot_server)
+BOOT_SERVER_PORT=$(cat $BOOT_DIR/boot_server_port)
 
 # the file to request from the boot server
-BOOT_SERVER_PATH=`cat $BOOT_DIR/boot_server_path`
+BOOT_SERVER_PATH=$(cat $BOOT_DIR/boot_server_path)
 
 # location of the cacert for this boot server
 BOOT_SERVER_CACERT=$BOOT_DIR/cacert.pem
@@ -33,11 +35,11 @@ BOOT_SERVER_CACERT=$BOOT_DIR/cacert.pem
 BOOT_SERVER_GPG_KEYRING=$BOOT_DIR/pubring.gpg
 
 # get the backup server we are going to be contacting
-BACKUP_BOOT_SERVER=`cat $BOOT_DIR/backup/boot_server`
-BACKUP_BOOT_SERVER_PORT=`cat $BOOT_DIR/backup/boot_server_port`
+BACKUP_BOOT_SERVER=$(cat $BOOT_DIR/backup/boot_server)
+BACKUP_BOOT_SERVER_PORT=$(cat $BOOT_DIR/backup/boot_server_port)
 
 # the file to request from the backup boot server
-BACKUP_BOOT_SERVER_PATH=`cat $BOOT_DIR/backup/boot_server_path`
+BACKUP_BOOT_SERVER_PATH=$(cat $BOOT_DIR/backup/boot_server_path)
 
 # location of the cacert for the backup boot server
 BACKUP_BOOT_SERVER_CACERT=$BOOT_DIR/backup/cacert.pem
@@ -105,11 +107,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
 
@@ -161,32 +159,31 @@ while : ; do
             umount /tmp/boot-media
             rmdir /tmp/boot-media
         else
-			case $curl_err in
-				6)
-        			echo $(date "+%H:%M:%S") " This error likely indicates a networking configuration error. "
-        			echo $(date "+%H:%M:%S") " Please, check whether you can ping this machine.  If you can, "
-        			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*` ; do 
-						echo $(date "+%H:%M:%S") $file :
-						cat $file
-					done
-				;;
-				60)
-        			echo $(date "+%H:%M:%S") " This error likely indicates that the hardware clock is not set "
-					echo $(date "+%H:%M:%S") " to GMT.  The result is that authentication between the local and "
-					echo $(date "+%H:%M:%S") " remote site fails.  Please double check this machine's system "
-					echo $(date "+%H:%M:%S") " clock, and set it to GMT in the BIOS. If after rebooting the same "
-					echo $(date "+%H:%M:%S") " error occurs, please report the situation to support@planet-lab.org "
-        			echo $(date "+%H:%M:%S") " with as much detail as possible."
-				;;
-				*)
-        			echo $(date "+%H:%M:%S") " The best-practice approach for handling this error is not yet "
-        			echo $(date "+%H:%M:%S") " documented.  Please report this error to support@planet-lab.org "
-        			echo $(date "+%H:%M:%S") " with as much detail as possible."
-				;;
-			esac
+            case $curl_err in
+                6)
+                    echo $(date "+%H:%M:%S") " This error likely indicates a networking configuration error. "
+                    echo $(date "+%H:%M:%S") " Please, check whether you can ping this machine.  If you can, "
+                    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."
+                ;;
+                60)
+                    echo $(date "+%H:%M:%S") " This error likely indicates that the hardware clock is likely not set "
+                    echo $(date "+%H:%M:%S") " to GMT.  The result is that authentication between the local and "
+                    echo $(date "+%H:%M:%S") " remote site fails.  Please double check this machine's system "
+                    echo $(date "+%H:%M:%S") " clock, and set it to GMT in the BIOS. If after rebooting the same "
+                    echo $(date "+%H:%M:%S") " error occurs, please report the situation to support@planet-lab.org "
+                    echo $(date "+%H:%M:%S") " with as much detail as possible."
+                ;;
+                *)
+                    echo $(date "+%H:%M:%S") " The best-practice approach for handling this error is not yet "
+                    echo $(date "+%H:%M:%S") " documented.  Please report this error to support@planet-lab.org "
+                    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