]> code.ossystems Code Review - openembedded-core.git/commitdiff
runqemu-gen-tapdevs: remove /etc/runqemu-nosudo when remove taps
authorRobert Yang <liezhi.yang@windriver.com>
Mon, 19 Sep 2016 09:18:58 +0000 (02:18 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 20 Sep 2016 14:10:36 +0000 (15:10 +0100)
It creats /etc/runqemu-nosudo when creats taps, so should remove it when
remove taps.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
scripts/runqemu-gen-tapdevs

index 624deacb7011160032f6008e42c442d325e3c7a3..bfb60f44ae3421aa9499d80377559ebd494e9b43 100755 (executable)
@@ -69,32 +69,38 @@ if [ ! -x "$IFCONFIG" ]; then
        exit 1
 fi
 
-# Ensure we start with a clean slate
-for tap in `$IFCONFIG link | grep tap | awk '{ print \$2 }' | sed s/://`; do
-       echo "Note: Destroying pre-existing tap interface $tap..."
-       $TUNCTL -d $tap
-done
-
-echo "Creating $COUNT tap devices for UID: $TUID GID: $GID..."
-for ((index=0; index < $COUNT; index++)); do
-       echo "Creating tap$index"
-       ifup=`$RUNQEMU_IFUP $TUID $GID $SYSROOT 2>&1`
-       if [ $? -ne 0 ]; then
-               echo "Error running tunctl: $ifup"
-               exit 1
-       fi
-done
+if [ $COUNT -ge 0 ]; then
+       # Ensure we start with a clean slate
+       for tap in `$IFCONFIG link | grep tap | awk '{ print \$2 }' | sed s/://`; do
+               echo "Note: Destroying pre-existing tap interface $tap..."
+               $TUNCTL -d $tap
+       done
+       rm -f /etc/runqemu-nosudo
+else
+       echo "Error: Incorrect count: $COUNT"
+       exit 1
+fi
 
 if [ $COUNT -gt 0 ]; then
+       echo "Creating $COUNT tap devices for UID: $TUID GID: $GID..."
+       for ((index=0; index < $COUNT; index++)); do
+               echo "Creating tap$index"
+               ifup=`$RUNQEMU_IFUP $TUID $GID $SYSROOT 2>&1`
+               if [ $? -ne 0 ]; then
+                       echo "Error running tunctl: $ifup"
+                       exit 1
+               fi
+       done
+
        echo "Note: For systems running NetworkManager, it's recommended"
        echo "Note: that the tap devices be set as unmanaged in the"
        echo "Note: NetworkManager.conf file. Add the following lines to"
        echo "Note: /etc/NetworkManager/NetworkManager.conf"
        echo "[keyfile]"
        echo "unmanaged-devices=interface-name:tap*"
-fi
 
-# The runqemu script will check for this file, and if it exists,
-# will use the existing bank of tap devices without creating
-# additional ones via sudo.
-touch /etc/runqemu-nosudo
+       # The runqemu script will check for this file, and if it exists,
+       # will use the existing bank of tap devices without creating
+       # additional ones via sudo.
+       touch /etc/runqemu-nosudo
+fi