From f891cc995b1e56240da74516b117e17d551fccc4 Mon Sep 17 00:00:00 2001 From: jjhua Date: Sat, 29 Sep 2012 07:40:50 +0000 Subject: [PATCH] fixed bug 3113, remove some error message when clearing the last configuration git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@13915 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/share/xcat/ib/scripts/configiba.1port | 10 +++++++--- xCAT-server/share/xcat/ib/scripts/configiba.2ports | 9 ++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/xCAT-server/share/xcat/ib/scripts/configiba.1port b/xCAT-server/share/xcat/ib/scripts/configiba.1port index 9f991dd4c..a00b529c5 100755 --- a/xCAT-server/share/xcat/ib/scripts/configiba.1port +++ b/xCAT-server/share/xcat/ib/scripts/configiba.1port @@ -87,9 +87,13 @@ else #for (( num = 0; num < loop_number; num++ )) while [ $num -lt $loop_number ] do - num1=`expr $num % 2` - `rmdev -d -l ib$num` - `rmdev -d -l ml$num1` + `rmdev -d -l ib$num >/dev/null 2>&1` + n=`expr $num % 2` + if [ $n == 1 ] + then + mlnum=`expr $num / 2` + `rmdev -d -l ml$mlnum >/dev/null 2>&1` + fi num=`expr $num + 1` done diff --git a/xCAT-server/share/xcat/ib/scripts/configiba.2ports b/xCAT-server/share/xcat/ib/scripts/configiba.2ports index f36f5df38..4e78028c2 100755 --- a/xCAT-server/share/xcat/ib/scripts/configiba.2ports +++ b/xCAT-server/share/xcat/ib/scripts/configiba.2ports @@ -82,9 +82,11 @@ else #for (( num = 0; num < loop_number; num++ )) while [ $num -lt $loop_number ] do - num1=`expr $num % 2` - `rmdev -d -l ib$num` - `rmdev -d -l ml$num1` + num0=`expr $num \* 2` + num1=`expr $num0 + 1` + `rmdev -d -l ib$num0 >/dev/null 2>&1` + `rmdev -d -l ib$num1 >/dev/null 2>&1` + `rmdev -d -l ml$num >/dev/null 2>&1` num=`expr $num + 1` done @@ -94,6 +96,7 @@ else fi + HOST=`hostname -s` num=0