ia64/xen-unstable

changeset 6199:8523b124c8f8

merge
author iap10@firebug.cl.cam.ac.uk
date Tue Aug 16 01:01:19 2005 +0000 (2005-08-16)
parents a3fa9406d926 ff3460690004
children 60d20acf8928
files linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64 linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64 linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_64 tools/debugger/pdb/Domain.ml tools/debugger/pdb/Domain.mli tools/debugger/pdb/Makefile tools/debugger/pdb/PDB.ml tools/debugger/pdb/Process.ml tools/debugger/pdb/Process.mli tools/debugger/pdb/debugger.ml tools/debugger/pdb/linux-2.6-module/debug.c tools/debugger/pdb/linux-2.6-module/module.c tools/debugger/pdb/linux-2.6-module/pdb_debug.h tools/debugger/pdb/linux-2.6-module/pdb_module.h tools/debugger/pdb/linux-2.6-patches/i386_ksyms.patch tools/debugger/pdb/pdb_caml_domain.c tools/debugger/pdb/pdb_caml_process.c tools/debugger/pdb/readme tools/examples/network-bridge
line diff
    19.1 --- a/tools/examples/network-bridge	Mon Aug 15 19:04:28 2005 +0000
    19.2 +++ b/tools/examples/network-bridge	Tue Aug 16 01:01:19 2005 +0000
    19.3 @@ -188,12 +188,13 @@ op_start () {
    19.4  		fi
    19.5  	fi
    19.6  	ip link set ${netdev} name p${netdev}
    19.7 -	ip link set veth0 name eth0
    19.8 +	ip link set veth0 name ${netdev}
    19.9  	ifconfig p${netdev} -arp down
   19.10  	ifconfig p${netdev} hw ether fe:ff:ff:ff:ff:ff
   19.11  	ifconfig ${netdev} hw ether ${mac}
   19.12  	add_to_bridge ${bridge} vif0.0
   19.13  	add_to_bridge ${bridge} p${netdev}
   19.14 +	ip link set ${bridge} up
   19.15  	ip link set vif0.0 up
   19.16  	ip link set p${netdev} up
   19.17  	if ! ifup ${netdev} ; then