aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>2003-03-16 12:48:16 +0000
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>2003-03-16 12:48:16 +0000
commitb168be59be9fbaee4d593d10598e29616f6db019 (patch)
tree004a6f29e7f0f3806ff493dfb59e2904c3d2d86a /tools
parent9747f3fe98f68e0b6957b672c7e8bdd5abf9e0ec (diff)
downloadxen-b168be59be9fbaee4d593d10598e29616f6db019.tar.gz
xen-b168be59be9fbaee4d593d10598e29616f6db019.tar.bz2
xen-b168be59be9fbaee4d593d10598e29616f6db019.zip
bitkeeper revision 1.138.1.1 (3e747290naA-qNOJaNg13FTUXkrcdw)
further cleanup to domain building scripts
Diffstat (limited to 'tools')
-rwxr-xr-xtools/domain_builder/mynewdom13
-rwxr-xr-xtools/domain_builder/newdom2
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