1.1 --- a/tools/x2d2/main.c	Fri Nov 12 16:44:19 2004 +0000
     1.2 +++ b/tools/x2d2/main.c	Fri Nov 12 16:55:35 2004 +0000
     1.3 @@ -24,6 +24,9 @@
     1.4  
     1.5  #include "minixend.h"
     1.6  
     1.7 +#define NETWORK_SCRIPT "/etc/xen/scripts/network"
     1.8 +#define VIFBRIDGE_SCRIPT "/etc/xen/scripts/vif-bridge"
     1.9 +
    1.10  #define MINIXEND_PORT 5123
    1.11  
    1.12  #define mb() asm volatile ("" ::: "memory")
    1.13 @@ -383,7 +386,7 @@ handle_netif_fe_driver_status_changed(co
    1.14  		}
    1.15  		d->created_netif_backend = 1;
    1.16  
    1.17 -		r = our_system("/etc/xen/vif-bridge up domain=%s mac=%.02x:%.02x:%.02x:%.02x:%.02x:%.02x vif=vif%d.0 bridge=xen-br0",
    1.18 +		r = our_system(VIFBRIDGE_SCRIPT " up domain=%s mac=%.02x:%.02x:%.02x:%.02x:%.02x:%.02x vif=vif%d.0 bridge=xen-br0",
    1.19  			       d->name,
    1.20  			       d->netif_mac[0],
    1.21  			       d->netif_mac[1],
    1.22 @@ -393,7 +396,7 @@ handle_netif_fe_driver_status_changed(co
    1.23  			       d->netif_mac[5],
    1.24  			       d->domid);
    1.25  		if (r != 0)
    1.26 -			warn("error %d running vif-bridge script", r);
    1.27 +			warn("error %d running " VIFBRIDGE_SCRIPT, r);
    1.28  
    1.29  		/* Tell domain how many interfaces it has to deal
    1.30  		 * with. */
    1.31 @@ -969,18 +972,18 @@ main(int argc, char *argv[])
    1.32  {
    1.33  	int r;
    1.34  
    1.35 -	r = our_system("/etc/xen/network start antispoof=no");
    1.36 +	r = our_system(NETWORK SCRIPT " start antispoof=no");
    1.37  	if (r < 0)
    1.38 -		err(1, "running /etc/xen/network");
    1.39 +		err(1, "running " NETWORK_SCRIPT);
    1.40  	if (!WIFEXITED(r)) {
    1.41  		if (WIFSIGNALED(r)) {
    1.42 -			errx(1, "/etc/xen/network killed by signal %d",
    1.43 +			errx(1, NETWORK_SCRIPT " killed by signal %d",
    1.44  			     WTERMSIG(r));
    1.45  		}
    1.46 -		errx(1, "/etc/xen/network terminated abnormally");
    1.47 +		errx(1, NETWORK_SCRIPT " terminated abnormally");
    1.48  	}
    1.49  	if (WEXITSTATUS(r) != 0)
    1.50 -		errx(1, "/etc/xen/network returned error status %d",
    1.51 +		errx(1, NETWORK_SCRIPT " returned error status %d",
    1.52  		     WEXITSTATUS(r));
    1.53  
    1.54  	xc_handle = xc_interface_open();