From f61245ec146abbcb84391dac2bc1d1e5a38d4b4a Mon Sep 17 00:00:00 2001 From: lissav Date: Wed, 27 Apr 2011 11:35:34 +0000 Subject: [PATCH] undo fix for 3289489 hangs install see defect comments git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9414 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT/postscripts/getcredentials.awk | 10 ++-------- xCAT/postscripts/getpostscript.awk | 6 ++---- xCAT/postscripts/startsyncfiles.awk | 2 +- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/xCAT/postscripts/getcredentials.awk b/xCAT/postscripts/getcredentials.awk index 1998c2024..781dfc659 100755 --- a/xCAT/postscripts/getcredentials.awk +++ b/xCAT/postscripts/getcredentials.awk @@ -1,7 +1,7 @@ #!/usr/bin/awk -f BEGIN { if (ENVIRON["USEOPENSSLFORXCAT"]) { - server = "openssl s_client -connect " ENVIRON["XCATSERVER"] " 2> /dev/null" + server = "openssl s_client -quiet -connect " ENVIRON["XCATSERVER"] " 2> /dev/null" } else { server = "/inet/tcp/0/127.0.0.1/400" } @@ -15,14 +15,8 @@ BEGIN { print " "ARGV[i]"" |& server print "" |& server - start = 0 while (server |& getline) { - if (match($0,"")) { - start = 1 - } - if (start == 1) { - print $0 - } + print $0 if (match($0,"")) { quit = "yes" } diff --git a/xCAT/postscripts/getpostscript.awk b/xCAT/postscripts/getpostscript.awk index 29c40921f..14be03f59 100755 --- a/xCAT/postscripts/getpostscript.awk +++ b/xCAT/postscripts/getpostscript.awk @@ -1,7 +1,7 @@ #!/usr/bin/awk -f BEGIN { if (ENVIRON["USEOPENSSLFORXCAT"]) { - server = "openssl s_client -connect " ENVIRON["XCATSERVER"] " 2> /dev/null" + server = "openssl s_client -quiet -connect " ENVIRON["XCATSERVER"] " 2> /dev/null" } else { server = "/inet/tcp/0/127.0.0.1/400" } @@ -15,9 +15,7 @@ BEGIN { print "" |& server while (server |& getline) { - if (match($0,/^\s*")) { quit = "yes" } diff --git a/xCAT/postscripts/startsyncfiles.awk b/xCAT/postscripts/startsyncfiles.awk index 20e83dbd1..3e28fc10b 100755 --- a/xCAT/postscripts/startsyncfiles.awk +++ b/xCAT/postscripts/startsyncfiles.awk @@ -1,7 +1,7 @@ #!/usr/bin/awk -f BEGIN { if (ENVIRON["USEOPENSSLFORXCAT"]) { - server = "openssl s_client -connect " ENVIRON["XCATSERVER"] " 2> /dev/null" + server = "openssl s_client -quiet -connect " ENVIRON["XCATSERVER"] " 2> /dev/null" } else { server = "/inet/tcp/0/127.0.0.1/400" }