github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-22 13:37:10 +00:00
Code Issues Projects Releases Wiki Activity

replace ifconfig & brctl with ip command

Browse Source 
clearlinux package will remove ifconfig/brctl tools.

Signed-off-by: Minggui Cao <minggui.cao@intel.com>
Reviewed-by: Binbin Wu <binbin.wu@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Minggui Cao 2018-06-07 10:38:55 +08:00 committed by lijinxia
parent 4bb5e60de5
commit a9b4e7e05c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devicemodel/samples/apl-mrb/launch_uos.sh
View File

@ -8,13 +8,13 @@ if [ ! -f "/data/$5/$5.img" ]; then
fi fi
#vm-name used to generate uos-mac address #vm-name used to generate uos-mac address
mac=$(cat /sys/class/net/ens4/address) mac=$(cat /sys/class/net/en*/address)
vm_name=vm$1 vm_name=vm$1
vm_name=${vm_name}-${mac:9:8} vm_name=${vm_name}-${mac:9:8}
# create a unique tap device for each VM # create a unique tap device for each VM
tap=tap_LaaG tap=tap_LaaG
tap_exist=$(ifconfig | grep acrn_"$tap" | awk '{print $1}') tap_exist=$(ip a | grep acrn_"$tap" | awk '{print $1}')
if [ "$tap_exist"x != "x" ]; then if [ "$tap_exist"x != "x" ]; then
echo "tap device existed, reuse acrn_$tap" echo "tap device existed, reuse acrn_$tap"
else else
@ -22,10 +22,10 @@ else
fi fi
# if acrn-br0 exists, add VM's unique tap device under it # if acrn-br0 exists, add VM's unique tap device under it
br_exist=$(ifconfig | grep acrn-br0 | awk '{print $1}') br_exist=$(ip a | grep acrn-br0 | awk '{print $1}')
if [ "$br_exist"x != "x" -a "$tap_exist"x = "x" ]; then if [ "$br_exist"x != "x" -a "$tap_exist"x = "x" ]; then
echo "acrn-br0 bridge aleady exists, adding new tap device to it..." echo "acrn-br0 bridge aleady exists, adding new tap device to it..."
brctl addif acrn-br0 acrn_"$tap" ip link set acrn_"$tap" master acrn-br0
ip link set dev acrn_"$tap" down ip link set dev acrn_"$tap" down
ip link set dev acrn_"$tap" up ip link set dev acrn_"$tap" up
fi fi
@ -133,13 +133,13 @@ if [ ! -f "/data/$5/$5.img" ]; then
fi fi
#vm-name used to generate uos-mac address #vm-name used to generate uos-mac address
mac=$(cat /sys/class/net/ens4/address) mac=$(cat /sys/class/net/en*/address)
vm_name=vm$1 vm_name=vm$1
vm_name=${vm_name}-${mac:9:8} vm_name=${vm_name}-${mac:9:8}
# create a unique tap device for each VM # create a unique tap device for each VM
tap=tap_AaaG tap=tap_AaaG
tap_exist=$(ifconfig | grep acrn_"$tap" | awk '{print $1}') tap_exist=$(ip a | grep acrn_"$tap" | awk '{print $1}')
if [ "$tap_exist"x != "x" ]; then if [ "$tap_exist"x != "x" ]; then
echo "tap device existed, reuse acrn_$tap" echo "tap device existed, reuse acrn_$tap"
else else
@ -147,10 +147,10 @@ else
fi fi
# if acrn-br0 exists, add VM's unique tap device under it # if acrn-br0 exists, add VM's unique tap device under it
br_exist=$(ifconfig | grep acrn-br0 | awk '{print $1}') br_exist=$(ip a | grep acrn-br0 | awk '{print $1}')
if [ "$br_exist"x != "x" -a "$tap_exist"x = "x" ]; then if [ "$br_exist"x != "x" -a "$tap_exist"x = "x" ]; then
echo "acrn-br0 bridge aleady exists, adding new tap device to it..." echo "acrn-br0 bridge aleady exists, adding new tap device to it..."
brctl addif acrn-br0 acrn_"$tap" ip link set acrn_"$tap" master acrn-br0
ip link set dev acrn_"$tap" down ip link set dev acrn_"$tap" down
ip link set dev acrn_"$tap" up ip link set dev acrn_"$tap" up
fi fi