From 2ae6883a8b533644c4398ee41f2bf737371b3d2d Mon Sep 17 00:00:00 2001 From: Masamichi Takagi Date: Thu, 19 Oct 2017 01:48:23 +0900 Subject: [PATCH] mcreboot.sh, mcstop+release.sh: Fix retry loop of shutdown --- arch/x86_64/tools/mcreboot-smp-x86.sh.in | 2 +- arch/x86_64/tools/mcstop+release-smp-x86.sh.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86_64/tools/mcreboot-smp-x86.sh.in b/arch/x86_64/tools/mcreboot-smp-x86.sh.in index 1ed82292..964e2947 100644 --- a/arch/x86_64/tools/mcreboot-smp-x86.sh.in +++ b/arch/x86_64/tools/mcreboot-smp-x86.sh.in @@ -343,7 +343,7 @@ if ls /dev/mcos* 1>/dev/null 2>&1; then ind=`echo $i|cut -c10-`; # Retry when conflicting with ihkmond nretry=0 - until ${SBINDIR}/ihkconfig 0 destroy $ind || [ $nretry -lt 4 ]; do + until ${SBINDIR}/ihkconfig 0 destroy $ind || [ $nretry -ge 4 ]; do sleep 0.25 nretry=$[ $nretry + 1 ] done diff --git a/arch/x86_64/tools/mcstop+release-smp-x86.sh.in b/arch/x86_64/tools/mcstop+release-smp-x86.sh.in index 6c15876f..7396c794 100644 --- a/arch/x86_64/tools/mcstop+release-smp-x86.sh.in +++ b/arch/x86_64/tools/mcstop+release-smp-x86.sh.in @@ -37,7 +37,7 @@ if ls /dev/mcos* 1>/dev/null 2>&1; then ind=`echo $i|cut -c10-`; # Retry when conflicting with ihkmond nretry=0 - until ${SBINDIR}/ihkconfig 0 destroy $ind || [ $nretry -lt 4 ]; do + until ${SBINDIR}/ihkconfig 0 destroy $ind || [ $nretry -ge 4 ]; do sleep 0.25 nretry=$[ $nretry + 1 ] done