]> code.ossystems Code Review - openembedded-core.git/commitdiff
scrtips/poky-qemu: Fix network interface device numbering
authorRichard Purdie <rpurdie@linux.intel.com>
Fri, 10 Sep 2010 09:28:09 +0000 (10:28 +0100)
committerRichard Purdie <rpurdie@linux.intel.com>
Fri, 10 Sep 2010 09:45:55 +0000 (10:45 +0100)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
scripts/poky-qemu-ifup
scripts/poky-qemu-internal

index 68d8d37475867f2f60b743725f63f5b8b88b66d3..e248a27106cf19ec6da85b6612bff7ab231d616b 100755 (executable)
@@ -92,7 +92,7 @@ if [ "x$IFCONFIG" = "x" ]; then
        IFCONFIG=/sbin/ifconfig
 fi
 
-n=$[ `echo $TAP | sed 's/tap//'` + 1 ]
+n=$[ (`echo $TAP | sed 's/tap//'` * 2) + 1 ]
 $IFCONFIG $TAP 192.168.7.$n
 
 # setup NAT for tap0 interface to have internet access in QEMU
index 0cf4ced707610930b79c0e4e1cc2662417163ace..f1aa43945af5cac6679cd3411cd383038a25bae5 100755 (executable)
@@ -91,7 +91,10 @@ release_lock() {
     fi
 }
 
-KERNEL_NETWORK_CMD="ip=192.168.7.2::192.168.7.1:255.255.255.0"
+n1=$[ (`echo $TAP | sed 's/tap//'` * 2) + 1 ]
+n2=$[ (`echo $TAP | sed 's/tap//'` * 2) + 2 ]
+
+KERNEL_NETWORK_CMD="ip=192.168.7.$n2::192.168.7.$n1:255.255.255.0"
 QEMU_TAP_CMD="-net tap,vlan=0,ifname=$TAP,script=no,downscript=no"
 QEMU_NETWORK_CMD="-net nic,vlan=0 $QEMU_TAP_CMD"
 KERNCMDLINE="mem=$QEMU_MEMORY"