summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/runqemu-gen-tapdevs6
-rwxr-xr-xscripts/runqemu-ifup6
-rwxr-xr-xscripts/runqemu-internal6
3 files changed, 9 insertions, 9 deletions
diff --git a/scripts/runqemu-gen-tapdevs b/scripts/runqemu-gen-tapdevs
index f5be30ac32..d3b27be291 100755
--- a/scripts/runqemu-gen-tapdevs
+++ b/scripts/runqemu-gen-tapdevs
@@ -59,10 +59,10 @@ if [ ! -x "$RUNQEMU_IFUP" ]; then
59 exit 1 59 exit 1
60fi 60fi
61 61
62IFCONFIG=`which ifconfig 2> /dev/null` 62IFCONFIG=`which ip 2> /dev/null`
63if [ -z "$IFCONFIG" ]; then 63if [ -z "$IFCONFIG" ]; then
64 # Is it ever anywhere else? 64 # Is it ever anywhere else?
65 IFCONFIG=/sbin/ifconfig 65 IFCONFIG=/sbin/ip
66fi 66fi
67if [ ! -x "$IFCONFIG" ]; then 67if [ ! -x "$IFCONFIG" ]; then
68 echo "$IFCONFIG cannot be executed" 68 echo "$IFCONFIG cannot be executed"
@@ -70,7 +70,7 @@ if [ ! -x "$IFCONFIG" ]; then
70fi 70fi
71 71
72# Ensure we start with a clean slate 72# Ensure we start with a clean slate
73for tap in `$IFCONFIG | grep ^tap | awk '{ print \$1 }' | sed s/://`; do 73for tap in `$IFCONFIG link | grep tap | awk '{ print \$2 }' | sed s/://`; do
74 echo "Note: Destroying pre-existing tap interface $tap..." 74 echo "Note: Destroying pre-existing tap interface $tap..."
75 $TUNCTL -d $tap 75 $TUNCTL -d $tap
76done 76done
diff --git a/scripts/runqemu-ifup b/scripts/runqemu-ifup
index 0926faf439..8948153d5a 100755
--- a/scripts/runqemu-ifup
+++ b/scripts/runqemu-ifup
@@ -70,10 +70,10 @@ if [ $STATUS -ne 0 ]; then
70 fi 70 fi
71fi 71fi
72 72
73IFCONFIG=`which ifconfig 2> /dev/null` 73IFCONFIG=`which ip 2> /dev/null`
74if [ "x$IFCONFIG" = "x" ]; then 74if [ "x$IFCONFIG" = "x" ]; then
75 # better than nothing... 75 # better than nothing...
76 IFCONFIG=/sbin/ifconfig 76 IFCONFIG=/sbin/ip
77fi 77fi
78if [ ! -x "$IFCONFIG" ]; then 78if [ ! -x "$IFCONFIG" ]; then
79 echo "$IFCONFIG cannot be executed" 79 echo "$IFCONFIG cannot be executed"
@@ -100,7 +100,7 @@ if [ ! -x "$IPTABLES" ]; then
100fi 100fi
101 101
102n=$[ (`echo $TAP | sed 's/tap//'` * 2) + 1 ] 102n=$[ (`echo $TAP | sed 's/tap//'` * 2) + 1 ]
103$IFCONFIG $TAP 192.168.7.$n netmask 255.255.255.255 103$IFCONFIG addr add 192.168.7.$n/32 dev $TAP
104 104
105dest=$[ (`echo $TAP | sed 's/tap//'` * 2) + 2 ] 105dest=$[ (`echo $TAP | sed 's/tap//'` * 2) + 2 ]
106$ROUTE add -host 192.168.7.$dest $TAP 106$ROUTE add -host 192.168.7.$dest $TAP
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 3bd0a09d8e..3c5282d89a 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -139,16 +139,16 @@ if [ ! -d "$LOCKDIR" ]; then
139 chmod 777 $LOCKDIR 139 chmod 777 $LOCKDIR
140fi 140fi
141 141
142IFCONFIG=`which ifconfig 2> /dev/null` 142IFCONFIG=`which ip 2> /dev/null`
143if [ -z "$IFCONFIG" ]; then 143if [ -z "$IFCONFIG" ]; then
144 IFCONFIG=/sbin/ifconfig 144 IFCONFIG=/sbin/ip
145fi 145fi
146if [ ! -x "$IFCONFIG" ]; then 146if [ ! -x "$IFCONFIG" ]; then
147 echo "$IFCONFIG cannot be executed" 147 echo "$IFCONFIG cannot be executed"
148 exit 1 148 exit 1
149fi 149fi
150 150
151POSSIBLE=`$IFCONFIG -a | grep '^tap' | awk '{print $1}' | sed s/://` 151POSSIBLE=`$IFCONFIG link | grep 'tap' | awk '{print $2}' | sed s/://`
152TAP="" 152TAP=""
153LOCKFILE="" 153LOCKFILE=""
154for tap in $POSSIBLE; do 154for tap in $POSSIBLE; do