ia64/xen-unstable

changeset 4958:cc1c80ec8139

bitkeeper revision 1.1432 (428a0372Dg_Q9mIOPOkDIc7D3T4aww)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk
author cl349@firebug.cl.cam.ac.uk
date Tue May 17 14:45:06 2005 +0000 (2005-05-17)
parents 85f5f11a202e 38ec1443b7da
children a69f25cce562
files tools/examples/network tools/xcs/Makefile
line diff
     1.1 --- a/tools/examples/network	Tue May 17 13:21:01 2005 +0000
     1.2 +++ b/tools/examples/network	Tue May 17 14:45:06 2005 +0000
     1.3 @@ -164,6 +164,10 @@ op_start () {
     1.4  
     1.5      create_bridge ${bridge}
     1.6  
     1.7 +    if ifconfig 2>/dev/null | grep -q veth0 ; then
     1.8 +        return
     1.9 +    fi
    1.10 +
    1.11      if ifconfig veth0 2>/dev/null | grep -q veth0 ; then
    1.12          # Propagate MAC address and ARP responsibilities to virtual interface.
    1.13          mac=`ifconfig ${netdev} | grep HWadd | sed -e 's/.*\(..:..:..:..:..:..\).*/\1/'`
    1.14 @@ -197,6 +201,8 @@ op_stop () {
    1.15          return
    1.16      fi
    1.17  
    1.18 +    return
    1.19 +
    1.20      brctl delif ${bridge} ${netdev}
    1.21  
    1.22      if ifconfig veth0 2>/dev/null | grep -q veth0 ; then
     2.1 --- a/tools/xcs/Makefile	Tue May 17 13:21:01 2005 +0000
     2.2 +++ b/tools/xcs/Makefile	Tue May 17 14:45:06 2005 +0000
     2.3 @@ -40,6 +40,8 @@ xcsdump: xcsdump.c dump.c
     2.4  $(BIN): $(OBJS)
     2.5  	$(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_LIBXUTIL) -lxc -lxutil 
     2.6  
     2.7 +$(OBJS): $(HDRS)
     2.8 +
     2.9  install: xcs xcsdump
    2.10  	$(INSTALL_DIR) -p $(DESTDIR)/$(XCS_INSTALL_DIR)
    2.11  	$(INSTALL_DIR) -p $(DESTDIR)/usr/include