From 3d3a880f785e31e4e72470d2ae7f7598520c01f8 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Tue, 22 Aug 2017 15:10:58 +0800
Subject: [PATCH] Revise the test case confignetwork_static_installnic

---
 xCAT-test/autotest/testcase/confignetwork/cases0 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0
index 4ccd5bb3e..f468fae74 100644
--- a/xCAT-test/autotest/testcase/confignetwork/cases0
+++ b/xCAT-test/autotest/testcase/confignetwork/cases0
@@ -945,9 +945,9 @@ cmd:xdsh $$CN "mkdir -p /tmp/backupnet"
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/;cp -f /etc/network/interfaces /tmp";else echo "Sorry,this is not supported os"; fi
 check:rc==0
-cmd:xdsh $$CN 'killall dhclient'
-cmd:xdsh $$CN 'killall -KILL dhclient'
-cmd:xdsh $$CN 'rm -f /var/lib/dhcp/dhclient.leases /var/lib/dhclient/dhclient.leases'
+cmd:xdsh $$CN "kill $(ps -A | awk '/dhclient/ { print $1 }')"
+cmd:xdsh $$CN "kill -KILL $(ps -A | awk '/dhclient/ { print $1 }')"
+cmd:xdsh $$CN 'rm -f /var/lib/dhcp/dhclient*.lease* /var/lib/dhclient/dhclient*.lease*'
 check:rc==0
 cmd:updatenode $$CN 'confignetwork -s'
 check:rc==0
@@ -957,5 +957,5 @@ check:rc==0
 cmd:test -e /tmp/CN.stanza && rmdef $$CN && mkdef -z </tmp/CN.stanza; rm -rf /tmp/CN.stanza
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network-scripts/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/network/interfaces.d/;cp -f /tmp/interfaces /etc/network/";else echo "Sorry,this is not supported os"; fi
 cmd:xdsh $$CN "rm -rf /tmp/backupnet/ /tmp/interfaces"
-cmd:xdsh $$CN "if [ -f /etc/init.d/network ] then ; /etc/init.d/network restart ; elif [ -f /etc/init.d/networking ] then ; /etc/init.d/networking restart ; fi
+cmd:xdsh $$CN "if [ -f /etc/init.d/network ] then ; /etc/init.d/network restart ; elif [ -f /etc/init.d/networking ] then ; /etc/init.d/networking restart ; fi"
 end