-Change postscripts to be backwards compatible with 2.2 packed images (2.3 users may have to repack images)

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4072 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd

xCAT/postscripts/getcredentials.awk

@@ -1,6 +1,10 @@
 #!/usr/bin/awk -f
 BEGIN {
-        server = "openssl s_client -quiet -connect " ENVIRON["XCATSERVER"] " 2> /dev/null"
+        if (ENVIRON["USEOPENSSLFORXCAT"]) {
+            server = "openssl s_client -quiet -connect " ENVIRON["XCATSERVER"] " 2> /dev/null"
+        } else {
+            server = "/inet/tcp/0/127.0.0.1/400"
+        }
         quit = "no"
 
 

xCAT/postscripts/getpostscript.awk

@@ -1,6 +1,10 @@
 #!/usr/bin/awk -f
 BEGIN {
-        server = "openssl s_client -quiet -connect " ENVIRON["XCATSERVER"] " 2> /dev/null"
+        if (ENVIRON["USEOPENSSLFORXCAT"]) {
+            server = "openssl s_client -quiet -connect " ENVIRON["XCATSERVER"] " 2> /dev/null"
+        } else {
+            server = "/inet/tcp/0/127.0.0.1/400"
+        }
 
 
         quit = "no"

xCAT/postscripts/remoteshell

@@ -40,6 +40,8 @@ fi
 if [ ! -x /usr/bin/openssl ]; then
     exit 0
 fi
+USEOPENSSLFORXCAT=1 #explicitly declare the 2.3 method
+export USEOPENSSLFORXCAT
 allowcred.awk &
 CREDPID=$!
 sleep 1

xCAT/postscripts/startsyncfiles.awk

@@ -1,6 +1,10 @@
 #!/usr/bin/awk -f
 BEGIN {
-  server = "openssl s_client -quiet -connect " ENVIRON["XCATSERVER"] " 2> /dev/null"
+  if (ENVIRON["USEOPENSSLFORXCAT"]) {
+      server = "openssl s_client -quiet -connect " ENVIRON["XCATSERVER"] " 2> /dev/null"
+  } else {
+      server = "/inet/tcp/0/127.0.0.1/400"
+  }
 
   quit = "no"
   exitcode = 1

xCAT/postscripts/xcatclient

@@ -7,6 +7,8 @@
 if [ ! -x /usr/bin/openssl ]; then #Unless we have openssl stup
    exit 0
 fi
+USEOPENSSLFORXCAT=1 #Declare 2.3 style SSL
+export USEOPENSSLFORXCAT
    allowcred.awk &
    CREDPID=$!
    sleep 1

xCAT/postscripts/xcatdsklspost

@@ -46,6 +46,8 @@ fi
 if [ -x /usr/bin/openssl ]; then
      XCATSERVER="$SIP:3001"
      export XCATSERVER
+     USEOPENSSLFORXCAT=1 #Though this is the only method going forward, flag to allow backward compatibility with 2.2 generated netboot images
+     export USEOPENSSLFORXCAT
 fi
 mkdir -p /xcatpost; 
 mkdir -p /tmp/postage

xCAT/postscripts/xcatserver

@@ -7,6 +7,8 @@
 if [ ! -x /usr/bin/openssl ]; then
    exit 0
 fi
+USEOPENSSLFORXCAT=1
+export USEOPENSSLFORXCAT
    allowcred.awk &
    CREDPID=$!
    sleep 1