aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElizabeth Flanagan <elizabeth.flanagan@intel.com>2012-07-31 11:00:08 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-02 23:00:50 +0100
commita624ec02c4acec83efbe66406f22abafbdce5d63 (patch)
tree306434b1e502d3428343c66731b1d57c6fdcf4fd
parent5d691f1bc95dfb9109b07827b33957b1fa5b2fa4 (diff)
downloadopenembedded-core-contrib-a624ec02c4acec83efbe66406f22abafbdce5d63.tar.gz
runqemu-gen-tapdevs: add UID to CL options
runqemu-if* now requires UID as a command line option which means runqemu-gen-tapdevs needs to take it as an option. Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/runqemu-gen-tapdevs16
1 files changed, 9 insertions, 7 deletions
diff --git a/scripts/runqemu-gen-tapdevs b/scripts/runqemu-gen-tapdevs
index 15bccd4484..2c1ff0eefb 100755
--- a/scripts/runqemu-gen-tapdevs
+++ b/scripts/runqemu-gen-tapdevs
@@ -23,7 +23,8 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
usage() {
- echo "Usage: sudo $0 <gid> <num> <native-sysroot-basedir>"
+ echo "Usage: sudo $0 <uid> <gid> <num> <native-sysroot-basedir>"
+ echo "Where <uid> is the numeric user id the tap devices will be owned by"
echo "Where <gid> is the numeric group id the tap devices will be owned by"
echo "<num> is the number of tap devices to create (0 to remove all)"
echo "<native-sysroot-basedir> is the path to the build system's native sysroot"
@@ -35,14 +36,15 @@ if [ $EUID -ne 0 ]; then
exit
fi
-if [ $# -ne 3 ]; then
+if [ $# -ne 4 ]; then
echo "Error: Incorrect number of arguments"
usage
fi
-GID=$1
-COUNT=$2
-SYSROOT=$3
+TUID=$1
+GID=$2
+COUNT=$3
+SYSROOT=$4
TUNCTL=$SYSROOT/usr/bin/tunctl
if [[ ! -x "$TUNCTL" || -d "$TUNCTL" ]]; then
@@ -73,10 +75,10 @@ for tap in `$IFCONFIG | grep ^tap | awk '{ print \$1 }'`; do
$TUNCTL -d $tap
done
-echo "Creating $COUNT tap devices for GID $GID..."
+echo "Creating $COUNT tap devices for UID: $TUID GID: $GID..."
for ((index=0; index < $COUNT; index++)); do
echo "Creating tap$index"
- ifup=`$RUNQEMU_IFUP $GID $SYSROOT 2>&1`
+ ifup=`$RUNQEMU_IFUP $TUID $GID $SYSROOT 2>&1`
if [ $? -ne 0 ]; then
echo "Error running tunctl: $ifup"
exit 1