sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Robert Yang 2016-09-19 02:18:58 -07:00 committed by Richard Purdie
parent fad4caf84e
commit fbb99b22f9
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
scripts/runqemu-gen-tapdevs
View File

@ -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