Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c3a044c authored by sixiao@microsoft.com's avatar sixiao@microsoft.com Committed by David S. Miller
Browse files

tools: hv: ignore a NIC if it has been configured



Let bondvf.sh ignore this NIC if it has been configured, to prevent
user configuration from being overwritten unexpectly.

Signed-off-by: default avatarSimon Xiao <sixiao@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 98524e04
Loading
Loading
Loading
Loading
+25 −2
Original line number Diff line number Diff line
@@ -211,6 +211,30 @@ function create_bond {

	echo $'\nBond name:' $bondname

	if [ $distro == ubuntu ]
	then
		local mainfn=$cfgdir/interfaces
		local s="^[ \t]*(auto|iface|mapping|allow-.*)[ \t]+${bondname}"

		grep -E "$s" $mainfn
		if [ $? -eq 0 ]
		then
			echo "WARNING: ${bondname} has been configured already"
			return
		fi
	elif [ $distro == redhat ] || [ $distro == suse ]
	then
		local fn=$cfgdir/ifcfg-$bondname
		if [ -f $fn ]
		then
			echo "WARNING: ${bondname} has been configured already"
			return
		fi
	else
		echo "Unsupported Distro: ${distro}"
		return
	fi

	echo configuring $primary
	create_eth_cfg_pri_$distro $primary $bondname

@@ -219,8 +243,6 @@ function create_bond {

	echo creating: $bondname with primary slave: $primary
	create_bond_cfg_$distro $bondname $primary $secondary

	let bondcnt=bondcnt+1
}

for (( i=0; i < $eth_cnt-1; i++ ))
@@ -228,5 +250,6 @@ do
        if [ -n "${list_match[$i]}" ]
        then
		create_bond ${list_eth[$i]} ${list_match[$i]}
		let bondcnt=bondcnt+1
        fi
done