[PATCH net-next,v2] tools: hv: Add clean up for included files in Ubuntu net config

[Haiyang Zhang]

From: Haiyang Zhang <haiya...@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 <haiya...@microsoft.com>
---
 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