diff options
| author | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2003-03-16 12:48:24 +0000 |
|---|---|---|
| committer | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2003-03-16 12:48:24 +0000 |
| commit | 76a12a535f0b1cca119542df416657a767184486 (patch) | |
| tree | 36741a7fc179974910a562b6536afde3e38babad | |
| parent | ba08a5c6286346efe26997f55b508bfb54843dc4 (diff) | |
| parent | b168be59be9fbaee4d593d10598e29616f6db019 (diff) | |
| download | xen-76a12a535f0b1cca119542df416657a767184486.tar.gz xen-76a12a535f0b1cca119542df416657a767184486.tar.bz2 xen-76a12a535f0b1cca119542df416657a767184486.zip | |
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
| -rwxr-xr-x | tools/domain_builder/mynewdom | 13 | ||||
| -rwxr-xr-x | tools/domain_builder/newdom | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/tools/domain_builder/mynewdom b/tools/domain_builder/mynewdom index 843e603fa9..4532e6a7d2 100755 --- a/tools/domain_builder/mynewdom +++ b/tools/domain_builder/mynewdom @@ -4,6 +4,10 @@ SIZE=${1:?"size missing"} +SITE_NFS=128.232.32.20 +SITE_GW=128.232.32.1 +SITE_MASK=255.255.240.0 + shift; ARGS="$*" @@ -26,6 +30,11 @@ LOOKUP=`host $NEWADDR` echo $LOOKUP | grep 'domain name pointer' && NEWNAME=`echo $LOOKUP | sed -e 's!.*domain name pointer \([^ ]\+\).$!\1!'` echo New IP address : ${NEWADDR} name : ${NEWNAME} +#SITE_GW=`netstat -rn|while read a b c;do case "$a" in 0.0.0.0)echo "$b";;esac;done` + +IP_CONFIG="ip=${NEWADDR}:${SITE_NFS}:${SITE_GW}:${SITE_MASK}:${NEWNAME}:eth0:off" +echo IP_CONFIG : ${IP_CONFIG} + CMDLINE=`cat /proc/cmdline` case $CMDLINE in *root=/dev/nfs*) @@ -48,8 +57,8 @@ esac echo New root arguments : ${NEWROOT_DEV} -echo ./newdom ${SIZE} ${IMAGE} ${NEWADDR} ${NEWROOT_DEV} ${ARGS} +echo ./newdom ${SIZE} ${IMAGE} ${NEWADDR} ${IP_CONFIG} ${NEWROOT_DEV} ${EXTRA_ARGS} -./newdom ${SIZE} ${IMAGE} ${NEWADDR} ${NEWROOT_DEV} ${ARGS} +./newdom ${SIZE} ${IMAGE} ${NEWADDR} ${IP_CONFIG} ${NEWROOT_DEV} ${EXTRA_ARGS} diff --git a/tools/domain_builder/newdom b/tools/domain_builder/newdom index 3b0612638c..1961872923 100755 --- a/tools/domain_builder/newdom +++ b/tools/domain_builder/newdom @@ -16,7 +16,7 @@ shift; shift; shift echo ARGS $* -$DOM_BUILDER $SIZE $IMAGE 1 ro ip=$IP:128.232.32.20:128.232.32.1:255.255.240.0::eth0:off $* +$DOM_BUILDER $SIZE $IMAGE 1 $* DOM=$? echo DOM= $DOM |