[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2532/8267] runqemu-gen-tapdevs: remove /etc/runqemu-nosudo when remove taps

[Emmanuele Bassi <ebassi src gnome org>]

commit fbb99b22f91462b14ee8a6d1a4de76875828a721
Author: Robert Yang <liezhi yang windriver com>
Date:   Mon Sep 19 02:18:58 2016 -0700

    runqemu-gen-tapdevs: remove /etc/runqemu-nosudo when remove taps
    
    It creats /etc/runqemu-nosudo when creats taps, so should remove it when
    remove taps.
    
    (From OE-Core rev: 3d4bf5b0ea581e3e9b388328b086d03f9174fd61)
    
    Signed-off-by: Robert Yang <liezhi yang windriver com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/runqemu-gen-tapdevs |   46 ++++++++++++++++++++++++------------------
 1 files changed, 26 insertions(+), 20 deletions(-)
---
diff --git a/scripts/runqemu-gen-tapdevs b/scripts/runqemu-gen-tapdevs
index 624deac..bfb60f4 100755
--- a/scripts/runqemu-gen-tapdevs
+++ b/scripts/runqemu-gen-tapdevs
@@ -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