From 6f6a68bc37be8ea629a5e21bbb99b05f474dca51 Mon Sep 17 00:00:00 2001 From: Bin Xu Date: Thu, 7 Sep 2017 15:52:53 +0800 Subject: [PATCH] Not restart xcatd in 'servicenode' when the node is not stateless and statelite as it will fail in postscript stage. (#3872) --- xCAT/postscripts/servicenode | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/xCAT/postscripts/servicenode b/xCAT/postscripts/servicenode index 44a6a5cba..0be39a42d 100755 --- a/xCAT/postscripts/servicenode +++ b/xCAT/postscripts/servicenode @@ -104,9 +104,9 @@ if ($ENV{UPDATESECURITY} && $ENV{UPDATESECURITY} eq "1") { &getcreds; } else { # Linux # call xcatserver,xcatclient to transfer the SSL credentials and cfgloc - `logger -t xcat -p local4.info $::sdate servicenode: running xcatserver -d`; + `logger -t xcat -p local4.info $::sdate servicenode: running 'xcatserver -d'`; &runcmd("xcatserver -d"); - `logger -t xcat -p local4.info $::sdate servicenode: running xcatclient -d`; + `logger -t xcat -p local4.info $::sdate servicenode: running 'xcatclient -d'`; &runcmd("xcatclient -d"); } @@ -141,11 +141,13 @@ else &runcmd("xcatserver -d"); `logger -t xcat -p local4.info $::sdate servicenode: running 'xcatclient -d'`; &runcmd("xcatclient -d"); - # start xcatd if it is not up - $rc = &runcmd("$::XCATROOT/bin/lsxcatd -v 2>/dev/null|| service xcatd restart"); - if ($rc != 0) { - $msg = "$::sdate servicenode: Could not start xcatd.\n\n $::outref \n"; - `logger -t xcat -p local4.warning $msg`; + # start xcatd if it is not up when stateless or statelite + if ($ENV{NODESETSTATE} && ($ENV{NODESETSTATE} eq "netboot" || $ENV{NODESETSTATE} eq "statelite")) { + $rc = &runcmd("$::XCATROOT/bin/lsxcatd -v 2>/dev/null || service xcatd restart"); + if ($rc != 0) { + $msg = "$::sdate servicenode: Could not start xcatd.\n\n $::outref \n"; + `logger -t xcat -p local4.warning $msg`; + } } }