f23: patch for locating kernel to embed on bootcd

[bootcd.git] / initscripts / pl_boot

diff --git a/initscripts/pl_boot b/initscripts/pl_boot
index ce685c9..20f4491 100755 (executable)
--- a/initscripts/pl_boot
+++ b/initscripts/pl_boot
@@ -1,5 +1,11 @@
 #!/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
@@ -107,14 +113,12 @@ 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
 
+    # June 2015 : using --tlsv1 instead of sslv3 that should be available
+    # on all myplc from f14 inclusive
     # assemble the curl transaction
     CURL_CMD="/usr/bin/curl \
         --connect-timeout 60 \
@@ -126,7 +130,7 @@ while : ; do
         --form nonce=</tmp/nonce \
         --location \
         --output $UNVERIFIED_SCRIPT \
-        --sslv3  \
+        --tlsv1  \
         --silent \
         --show-error \
         --fail \