]>
Commit | Line | Data |
---|---|---|
d88f6317 | 1 | --- xen-2.0/tools/examples/network.orig 2005-05-22 12:56:31.000000000 +0200 |
2 | +++ xen-2.0/tools/examples/network 2005-06-13 14:23:26.000000000 +0200 | |
3 | @@ -69,7 +69,7 @@ | |
4 | # to 'dev $src'. Remove netmask as we'll add routes later. | |
5 | ip addr show dev ${src} | egrep '^ *inet ' | sed -e " | |
6 | s/inet/ip addr add/ | |
7 | -s@\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\)/[0-9]\+@\1@ | |
8 | +s@\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\)/[0-9]\*@\1@ | |
9 | s/${src}/dev ${dst}/ | |
10 | " | sh -e | |
11 | } | |
12 | @@ -104,7 +104,7 @@ | |
13 | s/^/ip route add / | |
14 | P | |
15 | d | |
16 | -" | sh -e | |
17 | +" | grep -v scope | sh -e | |
18 | } | |
19 | ||
20 | # Usage: create_bridge bridge | |
21 | @@ -185,6 +185,7 @@ | |
22 | else | |
23 | transfer_addrs ${netdev} ${bridge} | |
24 | transfer_routes ${netdev} ${bridge} | |
25 | + del_addrs ${netdev} | |
26 | fi | |
27 | ||
28 | # Attach the real interface to the bridge. | |
29 | --- xen-2.0/tools/examples/network.orig 2005-06-13 14:27:19.000000000 +0200 | |
30 | +++ xen-2.0/tools/examples/network 2005-06-13 14:36:01.000000000 +0200 | |
31 | @@ -79,7 +79,7 @@ | |
32 | local src=$1 | |
33 | ip addr show dev ${src} | egrep '^ *inet ' | sed -e " | |
34 | s/inet/ip addr del/ | |
35 | -s@\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\)/[0-9]\+@\1@ | |
36 | +s@\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\)/[0-9]\*@\1@ | |
37 | s/${src}/dev ${src}/ | |
38 | " | sh -e | |
39 | } |