Commit 1a4691b2 authored by Haiyang Zhang's avatar Haiyang Zhang Committed by David S. Miller

tools: hv: Add clean up function for Ubuntu config

This patch adds a function to clean up duplicate config info
on Ubuntu.
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent df789fe7
...@@ -101,9 +101,25 @@ function create_bond_cfg_redhat { ...@@ -101,9 +101,25 @@ function create_bond_cfg_redhat {
echo BONDING_OPTS=\"mode=active-backup miimon=100 primary=$2\" >>$fn echo BONDING_OPTS=\"mode=active-backup miimon=100 primary=$2\" >>$fn
} }
function del_eth_cfg_ubuntu {
local fn=$cfgdir/interfaces
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
cp $tmpfl $fn
rm $tmpfl
}
function create_eth_cfg_ubuntu { function create_eth_cfg_ubuntu {
local fn=$cfgdir/interfaces local fn=$cfgdir/interfaces
del_eth_cfg_ubuntu $1
echo $'\n'auto $1 >>$fn echo $'\n'auto $1 >>$fn
echo iface $1 inet manual >>$fn echo iface $1 inet manual >>$fn
echo bond-master $2 >>$fn echo bond-master $2 >>$fn
...@@ -119,6 +135,8 @@ function create_eth_cfg_pri_ubuntu { ...@@ -119,6 +135,8 @@ function create_eth_cfg_pri_ubuntu {
function create_bond_cfg_ubuntu { function create_bond_cfg_ubuntu {
local fn=$cfgdir/interfaces local fn=$cfgdir/interfaces
del_eth_cfg_ubuntu $1
echo $'\n'auto $1 >>$fn echo $'\n'auto $1 >>$fn
echo iface $1 inet dhcp >>$fn echo iface $1 inet dhcp >>$fn
echo bond-mode active-backup >>$fn echo bond-mode active-backup >>$fn
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment