From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758224AbdELTPi (ORCPT ); Fri, 12 May 2017 15:15:38 -0400 Received: from a2nlsmtp01-04.prod.iad2.secureserver.net ([198.71.225.38]:35386 "EHLO a2nlsmtp01-04.prod.iad2.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753488AbdELTPf (ORCPT ); Fri, 12 May 2017 15:15:35 -0400 x-originating-ip: 107.180.71.197 From: Haiyang Zhang To: davem@davemloft.net, netdev@vger.kernel.org Cc: haiyangz@microsoft.com, kys@microsoft.com, olaf@aepfle.de, vkuznets@redhat.com, linux-kernel@vger.kernel.org Subject: [PATCH net-next,v2] tools: hv: Add clean up for included files in Ubuntu net config Date: Fri, 12 May 2017 12:14:11 -0700 Message-Id: <1494616451-30130-1-git-send-email-haiyangz@exchange.microsoft.com> X-Mailer: git-send-email 1.7.1 Reply-To: haiyangz@microsoft.com X-CMAE-Envelope: MS4wfNySABNon2wj+/JV6FcuIIX+i9Hgxvf99hqC5OMMtmuxxJIRFoA3+OGmtLHsxqCTrKLUEJR4OvFgWU0VKv8RKhSD3S4zq9oECQfRpCcm+xoo7+nHIJHF janQxicMGp32NOLsKTEBRpYmMno3+JeLV3BdAIvkszuQ9v+I9tNPPPfLbTHRd9fFOMWteMWFLE2g/5fxP4SDsuDXTtXJ+a8oQCBCcqXrqBcULtXKDJKv2TqT thHSae41AaiPx7K7/damDRD9l2X6idC2e2Y0/vHJLg4vbFMeAzy2XttIz/qhVFVXeMWrAod26ObZEfiqPdTCMND+Mh1ojzw/8vJ5mrziih0hhkP6HgIzp/8H bgIYbcO6uQlrMLPit6CKjFElBuZMFQ== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Haiyang Zhang The clean up function is updated to cover duplicate config info in files included by "source" key word in Ubuntu network config. Signed-off-by: Haiyang Zhang --- tools/hv/bondvf.sh | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/tools/hv/bondvf.sh b/tools/hv/bondvf.sh index d85968c..112deba 100755 --- a/tools/hv/bondvf.sh +++ b/tools/hv/bondvf.sh @@ -102,15 +102,30 @@ function create_bond_cfg_redhat { } function del_eth_cfg_ubuntu { - local fn=$cfgdir/interfaces + local mainfn=$cfgdir/interfaces + local fnlist=( $mainfn ) + + local dirlist=(`awk '/^[ \t]*source/{print $2}' $mainfn`) + + local i + for i in "${dirlist[@]}" + do + fnlist+=(`ls $i 2>/dev/null`) + done + local tmpfl=$(mktemp) local nic_start='^[ \t]*(auto|iface|mapping|allow-.*)[ \t]+'$1 local nic_end='^[ \t]*(auto|iface|mapping|allow-.*|source)' - awk "/$nic_end/{x=0} x{next} /$nic_start/{x=1;next} 1" $fn >$tmpfl + local fn + for fn in "${fnlist[@]}" + do + awk "/$nic_end/{x=0} x{next} /$nic_start/{x=1;next} 1" \ + $fn >$tmpfl - cp $tmpfl $fn + cp $tmpfl $fn + done rm $tmpfl } -- 1.7.1