* [PATCH net-next] tools: hv: Add clean up for included files in Ubuntu net config
@ 2017-05-12 14:13 Haiyang Zhang
2017-05-12 16:20 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Haiyang Zhang @ 2017-05-12 14:13 UTC (permalink / raw)
To: davem, netdev; +Cc: haiyangz, kys, olaf, vkuznets, linux-kernel
From: Haiyang Zhang <haiyangz@microsoft.com>
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 <haiyangz@microsoft.com>
---
tools/hv/bondvf.sh | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
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
}
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] tools: hv: Add clean up for included files in Ubuntu net config
2017-05-12 14:13 [PATCH net-next] tools: hv: Add clean up for included files in Ubuntu net config Haiyang Zhang
@ 2017-05-12 16:20 ` David Miller
2017-05-12 18:46 ` Haiyang Zhang
0 siblings, 1 reply; 3+ messages in thread
From: David Miller @ 2017-05-12 16:20 UTC (permalink / raw)
To: haiyangz, haiyangz; +Cc: netdev, kys, olaf, vkuznets, linux-kernel
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [PATCH net-next] tools: hv: Add clean up for included files in Ubuntu net config
2017-05-12 16:20 ` David Miller
@ 2017-05-12 18:46 ` Haiyang Zhang
0 siblings, 0 replies; 3+ messages in thread
From: Haiyang Zhang @ 2017-05-12 18:46 UTC (permalink / raw)
To: David Miller; +Cc: netdev, KY Srinivasan, olaf, vkuznets, linux-kernel
> -----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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-05-12 18:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-12 14:13 [PATCH net-next] tools: hv: Add clean up for included files in Ubuntu net config Haiyang Zhang
2017-05-12 16:20 ` David Miller
2017-05-12 18:46 ` Haiyang Zhang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.