From d0468357c4f84d6af15d41171e5d21401a612d03 Mon Sep 17 00:00:00 2001 From: lissav Date: Wed, 17 Nov 2010 12:20:55 +0000 Subject: [PATCH] changed logic to check for runnin on SN to allow for install of MN when it use to be a service node git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8184 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/sbin/xcatconfig | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/xCAT-server/sbin/xcatconfig b/xCAT-server/sbin/xcatconfig index 659abf002..dc288454b 100755 --- a/xCAT-server/sbin/xcatconfig +++ b/xCAT-server/sbin/xcatconfig @@ -42,13 +42,6 @@ $::INSTALLDIR = "/install"; # Default TFTP dir location $::TFTPDIR = "/tftpboot"; -if ((xCAT::Utils->isServiceNode())) { # if not on Management Node - xCAT::MsgUtils->message( - 'E', - "xcatconfig should only be run on the Management Node." - ); - exit 1; -} # parse the options if ( @@ -123,6 +116,14 @@ if (($::INITIALINSTALL) && ($::UPDATEINSTALL)) xCAT::MsgUtils->message("N", $warning); exit 1; } +#If not asking to install and you are on the servicenode, then error +if (!($::INITIALINSTALL) && (xCAT::Utils->isServiceNode())) { + xCAT::MsgUtils->message( + 'E', + "xcatconfig should only be run on the Management Node." + ); + exit 1; +} # # Display command