diff --git a/xCAT-server/share/xcat/tools/mktoolscenter b/xCAT-server/share/xcat/tools/mktoolscenter index a39f3117c..65f93e22b 100755 --- a/xCAT-server/share/xcat/tools/mktoolscenter +++ b/xCAT-server/share/xcat/tools/mktoolscenter @@ -33,7 +33,6 @@ my %Options = ('interactive',"yes",'warnings','','log',"yes",'dump',"yes"); my @warnings; my $logfile = DEFAULT_LOG_FILE; my $now = localtime; -my $help; # # print a warning and wait a bit if warnings are enabled @@ -137,23 +136,6 @@ sub question { return $reply; } -sub usage { - print "Usage: mktoolscenter\n"; - print " --ph \n"; - print " --pp \n"; - print " --puser \n"; - print " --ppw \n"; - print " -l \n"; - print " -s\n"; - print " --nfsserver \n"; - print " --nfspath \n"; - print " --profilename \n"; - print " --help\n\n"; - print "Updates IBM system x server hardware using IBM Bootable Media Creator.\n\n"; - print "Author: Jim Turner\n"; -} - - # # Begin main # @@ -165,14 +147,21 @@ unless (GetOptions("s"=>\$surrogate, "l=s"=>\$logfile, "ph=s"=>\$proxy{host}, "pp=i"=>\$proxy{port}, "puser=s"=>\$proxy{user}, "ppw=s"=>\$proxy{pw}, "nfsserver=s"=>\$nfsserver,"nfspath=s"=>\$nfspath, - "profilename=s"=>\$profilename, "help"=>\$help, + "profilename=s"=>\$profilename, )) { - usage(); + printf "Usage:\n"; + printf "--ph \n"; + printf "--pp \n"; + printf "--puser \n"; + printf "--ppw \n"; + printf "-l \n"; + printf "-s\n"; + printf "--nfsserver \n"; + printf "--nfspath \n"; + printf "--profilename \n"; exit(1); } -if ($help) { usage(); exit 0; } - if (@ARGV > 0) { open(IN,"<",@ARGV[0]) || die "Cannot open input file @ARGV[0]"; $Options{interactive} = ''; @@ -444,7 +433,7 @@ export SEP_INSTALL_PATH=/tmp # UXSPI environment variable export UXLITE_CLEAN_INVFILE=1 export UXSPI_CLEAN_INVFILE=1 -export UXSPI_BINARY_PATH=`find /toolscenter/uxspi -name '*uxspi*.anyos*bin' | sort | tail -n 1` +export UXSPI_BINARY_PATH=`find /toolscenter/uxspi -name 'ibm_utl_uxspi*anyos*bin' | sort | tail -n 1` export UXSPI_GUI_CMD="xterm -geometry 168x58+5+5 +sb -e ${UXSPI_BINARY_PATH}" export UXSPI_TUI_CMD="${UXSPI_BINARY_PATH} update --tui --firmware -l ${UXSPI_BOOTABLE} --timeout=${UXSPI_TIMEOUT}" @@ -570,6 +559,6 @@ if ($surrogate eq 1) { output("Error executing tar") ; } else { - output("To unpack it tar -zxf surrogate.tgz -C $instroot/netboot"); + output("To unpack it tar -zxf surrogate.tgz -C /"); } }