From 707fd1c7e7c6ef64f5531bc5063a8206c3159fc0 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH] Remove trailing spaces in file xCAT-server/share/xcat/install/scripts/post.sles10.s390x --- .../xcat/install/scripts/post.sles10.s390x | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/xCAT-server/share/xcat/install/scripts/post.sles10.s390x b/xCAT-server/share/xcat/install/scripts/post.sles10.s390x index 605ad9a7e..b27c07698 100644 --- a/xCAT-server/share/xcat/install/scripts/post.sles10.s390x +++ b/xCAT-server/share/xcat/install/scripts/post.sles10.s390x @@ -26,7 +26,7 @@ fi for t in $(seq 1 20) do GOTIT=0 - + # Loop through the master/service nodes for i in $MASTER_IPS do @@ -34,14 +34,14 @@ do wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -e robots=off -nH --cut-dirs=2 --reject "index.html*" --no-parent -t 0 -T 60 http://$i$INSTALLDIR/postscripts/ -P /xcatpost if [ "$?" = "0" ]; then # Exit if openssl is not executable - if [ ! -x /usr/bin/openssl ]; then + if [ ! -x /usr/bin/openssl ]; then exit 1 fi - + # Get xcat server XCATSERVER=$i:3001 export XCATSERVER - USEOPENSSLFORXCAT=1 + USEOPENSSLFORXCAT=1 export USEOPENSSLFORXCAT # Move postscritps into /xcatpost @@ -62,7 +62,7 @@ do break fi - # Sleep a couple of seconds before trying again + # Sleep a couple of seconds before trying again let SLI=$RANDOM%10+10 sleep $SLI @@ -70,14 +70,14 @@ do /xcatpost/getpostscript.awk |egrep ''|sed -e 's/<[^>]*>//g'|egrep -v '^ *$'|sed -e 's/^ *//' > /tmp/mypostscript MYCONT=`grep MASTER /tmp/mypostscript` done - + # Make executable chmod 700 /tmp/mypostscript GOTIT=1 break fi done - + # If postscripts for this node are found if [ "$GOTIT" = "1" ]; then # Save the master/service node to /opt/xcat/xcatinfo file @@ -107,8 +107,8 @@ run_ps () { logdir=\"/var/log/xcat\" mkdir -p \$logdir logfile=\"/var/log/xcat/xcat.log\" - - if [ -f \$1 ]; then + + if [ -f \$1 ]; then echo \"Running postscript: \$@\" | tee -a \$logfile ./\$@ 2>&1 1> /tmp/tmp4xcatlog cat /tmp/tmp4xcatlog | tee -a \$logfile @@ -122,7 +122,7 @@ run_ps () { echo "cd /xcatpost" >> /tmp/mypostscript echo "$TMP" >> /tmp/mypostscript TMP=`sed "/postbootscripts-start-here/,/postbootscripts-end-here/ s/\(.*\)/run_ps \1/;s/run_ps\s*#/#/;s/run_ps\s*$//" /tmp/mypostscript` -echo "$TMP" > /tmp/mypostscript +echo "$TMP" > /tmp/mypostscript # Save post boot scripts to /tmp/mypostscript.post @@ -141,7 +141,7 @@ ln -s /etc/init.d/xcatpostinit1 /etc/init.d/rc3.d/S84xcatpostinit1 ln -s /etc/init.d/xcatpostinit1 /etc/init.d/rc4.d/S84xcatpostinit1 ln -s /etc/init.d/xcatpostinit1 /etc/init.d/rc5.d/S84xcatpostinit1 -# Create post install +# Create post install mkdir -p /opt/xcat cat >/opt/xcat/xcatinstallpost << 'EOF' # Copy the contents of /install/postscripts/xcatinstallpost here @@ -160,7 +160,7 @@ chmod 755 /opt/xcat/xcatinstallpost chkconfig --add xcatpostinit1 -#create the dskls post +#create the dskls post cat >/opt/xcat/xcatdsklspost << 'EOF' #INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost# EOF