Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752162AbdHHNxu (ORCPT ); Tue, 8 Aug 2017 09:53:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34218 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752059AbdHHNxs (ORCPT ); Tue, 8 Aug 2017 09:53:48 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 92B78C047B76 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=otubo@redhat.com From: Eduardo Otubo To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, Stephen Hemminger , Haiyang Zhang , "K . Y . Srinivasan" Subject: [PATCH] hv_set_ifconfig.sh double check before setting ip Date: Tue, 8 Aug 2017 15:53:45 +0200 Message-Id: <20170808135345.17027-1-otubo@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 08 Aug 2017 13:53:48 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1915 Lines: 55 This patch fixes the behavior of the hv_set_ifconfig script when setting the interface ip. Sometimes the interface has already been configured by network daemon, in this case hv_set_ifconfig causes "RTNETLINK: file exists error"; in order to avoid this error this patch makes sure double checks the interface before trying anything. Signed-off-by: Eduardo Otubo --- tools/hv/hv_set_ifconfig.sh | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/tools/hv/hv_set_ifconfig.sh b/tools/hv/hv_set_ifconfig.sh index 735aafd64a3f..ba5e4aa4efe2 100755 --- a/tools/hv/hv_set_ifconfig.sh +++ b/tools/hv/hv_set_ifconfig.sh @@ -46,19 +46,26 @@ # is expected to return the configuration that is set via the SET # call. # +interface=$(echo $1 | awk -F - '{ print $2 }') +current_ip=$(ip addr show $interface|grep "inet "); +config_file_ip=$(grep IPADDR $1|cut -d"=" -f2); +current_ipv6=$(ip addr show $interface|grep "inet6 "); +config_file_ipv6=$(grep IPV6ADDR $1|cut -d"=" -f2); +config_file_ipv6_netmask=$(grep IPV6NETMASK $1|cut -d"=" -f2); +config_file_ipv6=${config_file_ipv6}/${config_file_ipv6_netmask}; -echo "IPV6INIT=yes" >> $1 -echo "NM_CONTROLLED=no" >> $1 -echo "PEERDNS=yes" >> $1 -echo "ONBOOT=yes" >> $1 - - -cp $1 /etc/sysconfig/network-scripts/ - +# only set the IP if it's not configured yet +if [[ $(test "${current_ip#*$config_file_ip}") == "$config_file_ip" \ + || $(test "${current_ipv6#*$config_file_ipv6}") == "$current_ipv6" ]]; then + echo "IPV6INIT=yes" >> $1 + echo "NM_CONTROLLED=no" >> $1 + echo "PEERDNS=yes" >> $1 + echo "ONBOOT=yes" >> $1 -interface=$(echo $1 | awk -F - '{ print $2 }') + cp $1 /etc/sysconfig/network-scripts/ -/sbin/ifdown $interface 2>/dev/null -/sbin/ifup $interface 2>/dev/null + /sbin/ifdown $interface 2>/dev/null + /sbin/ifup $interface 2>/dev/null +fi -- 2.13.4