ia64/xen-unstable

changeset 322:497998a019d8

bitkeeper revision 1.141 (3e747298fIyTcN0X6-7FDVxVuf9b9Q)

Merge labyrinth.cl.cam.ac.uk:/usr/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk
author iap10@labyrinth.cl.cam.ac.uk
date Sun Mar 16 12:48:24 2003 +0000 (2003-03-16)
parents e27bfabd1b5a 022e38b46294
children 0f28cb35057d
files tools/domain_builder/mynewdom tools/domain_builder/newdom
line diff
     1.1 --- a/tools/domain_builder/mynewdom	Sun Mar 16 12:30:28 2003 +0000
     1.2 +++ b/tools/domain_builder/mynewdom	Sun Mar 16 12:48:24 2003 +0000
     1.3 @@ -4,6 +4,10 @@
     1.4  
     1.5  SIZE=${1:?"size missing"}
     1.6  
     1.7 +SITE_NFS=128.232.32.20
     1.8 +SITE_GW=128.232.32.1
     1.9 +SITE_MASK=255.255.240.0
    1.10 +
    1.11  shift;
    1.12  
    1.13  ARGS="$*"
    1.14 @@ -26,6 +30,11 @@ LOOKUP=`host $NEWADDR`
    1.15  echo $LOOKUP | grep 'domain name pointer' && NEWNAME=`echo $LOOKUP | sed -e 's!.*domain name pointer \([^ ]\+\).$!\1!'`
    1.16  echo New IP address : ${NEWADDR}  name : ${NEWNAME}
    1.17  
    1.18 +#SITE_GW=`netstat -rn|while read a b c;do case "$a" in 0.0.0.0)echo "$b";;esac;done`
    1.19 +
    1.20 +IP_CONFIG="ip=${NEWADDR}:${SITE_NFS}:${SITE_GW}:${SITE_MASK}:${NEWNAME}:eth0:off"
    1.21 +echo IP_CONFIG : ${IP_CONFIG}
    1.22 +
    1.23  CMDLINE=`cat /proc/cmdline`
    1.24  case $CMDLINE in
    1.25  *root=/dev/nfs*)
    1.26 @@ -48,8 +57,8 @@ esac
    1.27  
    1.28  echo New root arguments : ${NEWROOT_DEV}
    1.29  
    1.30 -echo ./newdom ${SIZE} ${IMAGE} ${NEWADDR} ${NEWROOT_DEV} ${ARGS}
    1.31 +echo ./newdom ${SIZE} ${IMAGE} ${NEWADDR} ${IP_CONFIG} ${NEWROOT_DEV} ${EXTRA_ARGS}
    1.32  
    1.33 -./newdom ${SIZE} ${IMAGE} ${NEWADDR} ${NEWROOT_DEV} ${ARGS}
    1.34 +./newdom ${SIZE} ${IMAGE} ${NEWADDR} ${IP_CONFIG} ${NEWROOT_DEV} ${EXTRA_ARGS}
    1.35  
    1.36  
     2.1 --- a/tools/domain_builder/newdom	Sun Mar 16 12:30:28 2003 +0000
     2.2 +++ b/tools/domain_builder/newdom	Sun Mar 16 12:48:24 2003 +0000
     2.3 @@ -16,7 +16,7 @@ shift; shift; shift
     2.4  
     2.5  echo ARGS $*
     2.6  
     2.7 -$DOM_BUILDER $SIZE $IMAGE 1 ro ip=$IP:128.232.32.20:128.232.32.1:255.255.240.0::eth0:off $*
     2.8 +$DOM_BUILDER $SIZE $IMAGE 1 $*
     2.9  DOM=$?
    2.10  
    2.11  echo DOM= $DOM