Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751582AbdH1KBc (ORCPT ); Mon, 28 Aug 2017 06:01:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35782 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751537AbdH1KB3 (ORCPT ); Mon, 28 Aug 2017 06:01:29 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 3341F8048C Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=otubo@redhat.com From: Eduardo Otubo To: linux-kernel@vger.kernel.org Cc: "K . Y . Srinivasan" , Haiyang Zhang , Stephen Hemminger , devel@linuxdriverproject.org, David Miller Subject: [PATCHv2] hv_set_ifconfig.sh double check before setting ip Date: Mon, 28 Aug 2017 12:01:21 +0200 Message-Id: <20170828100121.17321-1-otubo@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 28 Aug 2017 10:01:29 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2803 Lines: 76 v2: The script is now a little bit safer so it doesn't conflicts with network daemon trying to set configurations at the same time. 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 | 44 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/tools/hv/hv_set_ifconfig.sh b/tools/hv/hv_set_ifconfig.sh index 735aafd64a3f..3a04b91f61e3 100755 --- a/tools/hv/hv_set_ifconfig.sh +++ b/tools/hv/hv_set_ifconfig.sh @@ -46,19 +46,47 @@ # 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 +network_service_state=$(/bin/systemctl is-active network); +while [[ ${network_service_state} == "activating" \ + || ${network_service_state} == "deactivating" ]]; do + # Network script is still working. let's wait a bit. + # The default timeout for systemd is 90s. + sleep 30s; + ((i++)); + network_service_state=$(/bin/systemctl is-active network); -cp $1 /etc/sysconfig/network-scripts/ + # If network service doens't come up or down in 90s we log the + # error and give up. + if [[ $i == 3 ]]; then + logger "Couldn't set IP address for fail-over interface"\ + " because network daemon might be busy. Try to"\ + " if-down $interface && if-up $interface"\ + " manually later."; + exit 1; + fi +done +# 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.5