arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-Correct some issues with the mktoolscenter/toolscenter plugin (more durable changes TBD)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6807 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2010-07-20 19:41:45 +00:00
parent 40530b8a08
commit bd1ee24cbe
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-server/lib/xcat/plugins/toolscenter.pm
View File

@ -231,7 +231,7 @@ sub mknetboot
print $menush 'DIR=`dirname $0`'."\n";
print $menush 'ERROR_FILE=/bomc/${hostname}/asu.error',"\n";
print $menush 'LOG_FILE=/bomc/${hostname}/asu.log',"\n";
print $menush 'if [ ${cmos_file} != "" ]; then',"\n";
print $menush 'if [ "${cmos_file}" != "" ]; then',"\n";
print $menush " $asu",' batch ${cmos_file} >${LOG_FILE} 2>${ERROR_FILE}', "\n";
print $menush "fi\n";
print $menush '$DIR/calltoxcat.awk ${xcat_server} '."$xcatiport\n";

34
xCAT-server/share/xcat/tools/mktoolscenter
View File

@ -357,7 +357,7 @@ chmod +x /tmp/media_check.sh
cd /toolscenter/
chmod -R +x * /dev/null 2>/dev/null
dos2unix /toolscenter/bomc200.config > /dev/null 2>&1
dos2unix /toolscenter/bomc*.config > /dev/null 2>&1
#disable Crtl+z and Ctrl+c
trap "" 2 20
@ -366,16 +366,28 @@ BOMC_MENU=/toolscenter/menu/show_menu.sh
BOMC_LOG_FILE=/tmp/bomc.log
# Export the UXSPI_TIMEOUT environment to uxspi
TIMEOUT=60
if cat bomc200.config | grep IBM_SYSTEM_TIMEOUT > /dev/null 2>&1
if cat bomc*.config | grep IBM_SYSTEM_TIMEOUT > /dev/null 2>&1
then
TIMEOUT=`cat bomc200.config | grep IBM_SYSTEM_TIMEOUT | sed 's/IBM_SYSTEM_TIMEOUT=//'`
TIMEOUT=`cat bomc*.config | grep IBM_SYSTEM_TIMEOUT | sed 's/IBM_SYSTEM_TIMEOUT=//'`
fi
export UXSPI_TIMEOUT=${TIMEOUT}
# setup a mount point
mkdir -p /bomc
MNTPOINT=/bomc
mount -t nfs ${xcat_server}:#BOMCPATH# /bomc
if [ -z "${xcat_server}" ]; then
xcat_server=$(cat /proc/cmdline|sed -e 's/.*xcat_server=\([^ ]*\) .*/\1/')
fi
if [ -z "${xcat_server}" ]; then
echo "WARNING: xcat_server seems to be missing from the command line which looks like:"
cat /proc/cmdline
sleep 600
reboot -f
fi
if [ "$1" != "serial-on" ]; then #if this terminal is a fake, don't use it, awkward structure, but oh well
# setup a mount point
mkdir -p /bomc
MNTPOINT=/bomc
mount -t nfs ${xcat_server}:#BOMCPATH# /bomc
fi
export UXSPI_BOOTABLE=/bomc
@ -397,20 +409,20 @@ export DSA_CMD_CMD="xterm -geometry 168x58+5+5 +sb -e /toolscenter/dsa/start.sh
export DSA_TUI_CMD="/toolscenter/dsa/start.sh --cmd"
# Export environment for exit script command
if cat bomc200.config | grep "IBM_SYSTEM_MEDIA_EJECT=NO" > /dev/null 2>&1
if cat bomc*.config | grep "IBM_SYSTEM_MEDIA_EJECT=NO" > /dev/null 2>&1
then
export BOMC_EXIT_CMD="/toolscenter/tcexit_noeject.sh"
else
export BOMC_EXIT_CMD="/toolscenter/tcexit.sh"
fi
# Export environment for UXSPI autorun command
if cat bomc200.config | grep "IBM_SYSTEM_AUTORUN=uxspi" > /dev/null 2>&1
if cat bomc*.config | grep "IBM_SYSTEM_AUTORUN=uxspi" > /dev/null 2>&1
then
export UXSPI_AUTORUN=1
fi
# Export the unattended mode environment variable
UNATTD_FULLSTR=`cat bomc200.config | grep IBM_SYSTEM_UNATTENDED | sed 's/IBM_SYSTEM_UNATTENDED=//'`
UNATTD_FULLSTR=`cat bomc*.config | grep IBM_SYSTEM_UNATTENDED | sed 's/IBM_SYSTEM_UNATTENDED=//'`
if echo ${UNATTD_FULLSTR} | grep '[tftp://|ftp://|nfs://|smb://|usb:/]' > /dev/null 2>&1
then
echo "Unattended mode specified by user" >> ${BOMC_LOG_FILE}
@ -468,7 +480,7 @@ if [ "${BOMC_UNATTENDED_MODE}" = "1" ]
then
# Shut down the system when it's unattended image
${BOMC_EXIT_CMD} shutdown
elif cat bomc200.config | grep "IBM_SYSTEM_PXE_FILE=NULL" > /dev/null 2>&1
elif cat bomc*.config | grep "IBM_SYSTEM_PXE_FILE=NULL" > /dev/null 2>&1
then
echo "Rebooting the system ..."
${BOMC_EXIT_CMD} reboot