From a9b4e7e05cbca4768c3bb3f173e2633df8fe4e43 Mon Sep 17 00:00:00 2001
From: Minggui Cao <minggui.cao@intel.com>
Date: Thu, 7 Jun 2018 10:38:55 +0800
Subject: [PATCH] replace ifconfig & brctl with ip command

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>
---
 devicemodel/samples/apl-mrb/launch_uos.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/devicemodel/samples/apl-mrb/launch_uos.sh b/devicemodel/samples/apl-mrb/launch_uos.sh
index 63e7bc243..8fecbec23 100755
--- a/devicemodel/samples/apl-mrb/launch_uos.sh
+++ b/devicemodel/samples/apl-mrb/launch_uos.sh
@@ -8,13 +8,13 @@ if [ ! -f "/data/$5/$5.img" ]; then
 fi
 
 #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_name}-${mac:9:8}
 
 # create a unique tap device for each VM
 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
   echo "tap device existed, reuse acrn_$tap"
 else
@@ -22,10 +22,10 @@ else
 fi
 
 # 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
   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" up
 fi
@@ -133,13 +133,13 @@ if [ ! -f "/data/$5/$5.img" ]; then
 fi
 
 #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_name}-${mac:9:8}
 
 # create a unique tap device for each VM
 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
   echo "tap device existed, reuse acrn_$tap"
 else
@@ -147,10 +147,10 @@ else
 fi
 
 # 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
   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" up
 fi