Message ID | 1494598413-19106-1-git-send-email-haiyangz@exchange.microsoft.com |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
From: Haiyang Zhang <haiyangz@exchange.microsoft.com> Date: Fri, 12 May 2017 07:13:33 -0700 > > + 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 > + done Please indent the body of this loop properly.
> -----Original Message----- > From: David Miller [mailto:davem@davemloft.net] > Sent: Friday, May 12, 2017 12:20 PM > To: Haiyang Zhang <haiyangz@microsoft.com>; Haiyang Zhang > <haiyangz@microsoft.com> > Cc: netdev@vger.kernel.org; KY Srinivasan <kys@microsoft.com>; > olaf@aepfle.de; vkuznets@redhat.com; linux-kernel@vger.kernel.org > Subject: Re: [PATCH net-next] tools: hv: Add clean up for included files > in Ubuntu net config > > From: Haiyang Zhang <haiyangz@exchange.microsoft.com> > Date: Fri, 12 May 2017 07:13:33 -0700 > > > > > + 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 > > + done > > Please indent the body of this loop properly. Will do. Thanks.
diff --git a/tools/hv/bondvf.sh b/tools/hv/bondvf.sh index d85968c..1f42604 100755 --- a/tools/hv/bondvf.sh +++ b/tools/hv/bondvf.sh @@ -102,15 +102,29 @@ 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)' + 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 + done rm $tmpfl }