xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-31 01:56:39 +00:00
Code Issues Releases Wiki Activity

Clean up shell folder, and take the / out of the variable

Browse Source
This commit is contained in:
Victor Hu 2019-06-03 12:15:02 -04:00
parent 5516169634
commit f8e6f63e49
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xCAT-test/autotest/testcase/genesis/test.sh
View File

@ -63,8 +63,8 @@ function check_destiny() {
runcmd $cmd;
cmd="ifconfig $NET2 $NET2IP";
runcmd $cmd;
echo "Check if 'nodeset ${TESTNODE} shell' is added to $SHELLFOLDER"
cat "$SHELLFOLDER"${TESTNODE} |grep "xcatd=${MASTER_PRIVATE_IP}:3001 destiny=shell";
echo "Check if 'nodeset ${TESTNODE} shell' is added to ${SHELLFOLDER}/${TESTNODE}"
cat "${SHELLFOLDER}/${TESTNODE}" |grep "xcatd=${MASTER_PRIVATE_IP}:3001 destiny=shell";
if [[ $? -eq 0 ]] ;then
return 0;
else
@ -92,11 +92,11 @@ while [ "$#" -ge "0" ]; do
"--check" )
NETBOOT=$2;
if [[ $NETBOOT =~ petitboot ]];then
SHELLFOLDER="/tftpboot/petitboot/";
SHELLFOLDER="/tftpboot/petitboot";
elif [[ $NETBOOT =~ xnba ]];then
SHELLFOLDER="/tftpboot/xcat/xnba/nodes/"
SHELLFOLDER="/tftpboot/xcat/xnba/nodes"
else
SHELLFOLDER="/tftpboot/boot/grub2/";
SHELLFOLDER="/tftpboot/boot/grub2";
fi
check_destiny ;
if [[ $? -eq 1 ]];then