ia64/xen-unstable

changeset 571:ddb65ffc61be

bitkeeper revision 1.315 (3f0bfab8LOjeKZnavr_zYilEEFpUig)

Nuke remnants of domctl
author rac61@labyrinth.cl.cam.ac.uk
date Wed Jul 09 11:21:28 2003 +0000 (2003-07-09)
parents 6b2bf4c01047
children 4761636414af
files .rootkeys tools/control/Makefile tools/control/build-dom.xml tools/control/domctl
line diff
     1.1 --- a/.rootkeys	Wed Jul 09 11:18:53 2003 +0000
     1.2 +++ b/.rootkeys	Wed Jul 09 11:21:28 2003 +0000
     1.3 @@ -9,11 +9,9 @@ 3e6377dbGcgnisKw16DPCaND7oGO3Q tools/bal
     1.4  3eb781edFwm_pW9FwnQACIe68viLOw tools/control/Makefile
     1.5  3eca6a96a31IwaKtkEa4jmzwTWlm8Q tools/control/README-xenctl
     1.6  3eb781fceEYkUi1XHKf2V0KX7si2JA tools/control/build-cmdline.xml
     1.7 -3eb781fcTp_LPQwaot3SSSehkaf4eg tools/control/build-dom.xml
     1.8  3ec41f7cWCxQ8pdH8ZWqhhv-38qQ1w tools/control/build-xen.xml
     1.9  3ec41f7ca6IBXDSe0HVcMPp3PPloOQ tools/control/build.properties
    1.10  3ec4ebe0g_MI1VqkbbyNB8gt6m0Adg tools/control/docs/empty_dir
    1.11 -3eb781fcXf-WczEdAhnTpWfbR55jqA tools/control/domctl
    1.12  3eb781fcabCKRogwxJA3-jJKstw9Vg tools/control/domctl.xml
    1.13  3f042c35FzVap5QW0UBPnZ2ZM0l3QA tools/control/src/org/xenoserver/cmdline/CommandParser.java
    1.14  3eb781fdNQvEJW3tNvovjqoN7GlePA tools/control/src/org/xenoserver/cmdline/Main.java
     2.1 --- a/tools/control/Makefile	Wed Jul 09 11:18:53 2003 +0000
     2.2 +++ b/tools/control/Makefile	Wed Jul 09 11:21:28 2003 +0000
     2.3 @@ -19,19 +19,6 @@ clean-cmdline:
     2.4  
     2.5  
     2.6  
     2.7 -domctl: FORCE
     2.8 -	ant -buildfile build-dom.xml dist
     2.9 -
    2.10 -install-domctl: domctl
    2.11 -	cp domctl.jar domctl ../../../install/bin
    2.12 -	chmod 755 ../../../install/bin/domctl
    2.13 -
    2.14 -clean-domctl:
    2.15 -	ant -buildfile build-dom.xml clean
    2.16 -	rm -f domctl.jar
    2.17 -
    2.18 -
    2.19 -
    2.20  xenctl: FORCE
    2.21  	(cd web/tmpl; make)
    2.22  	ant -buildfile build-xen.xml dist
     3.1 --- a/tools/control/build-dom.xml	Wed Jul 09 11:18:53 2003 +0000
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,48 +0,0 @@
     3.4 -<project name="domctl project" default="compile">
     3.5 -  <property name="src" location="src"/>
     3.6 -  <property name="build" location="build-dom"/>
     3.7 -
     3.8 -  <target name="init">
     3.9 -    <tstamp/>
    3.10 -    <mkdir dir="${build}"/>     
    3.11 -  </target>
    3.12 -
    3.13 -  <target name="compile" depends="init">
    3.14 -    <javac srcdir="${src}" destdir="${build}" debug="on">
    3.15 -      <include name="uk/ac/cam/cl/xeno/domctl/**"/>
    3.16 -    </javac>
    3.17 -  </target>
    3.18 -
    3.19 -  <target name="dist" depends="compile">
    3.20 -    <jar jarfile="domctl.jar"
    3.21 -         excludes="*~"
    3.22 -	 basedir="${build}">
    3.23 -      <fileset dir="${src}">
    3.24 -        <include name="uk/ac/cam/cl/xeno/domctl/**"/>
    3.25 -      </fileset>
    3.26 -      <fileset dir=".">
    3.27 -        <include name="build-domctl.xml"/>
    3.28 -        <include name="domctl"/>
    3.29 -        <include name="domctl.xml"/>
    3.30 -        <include name="Makefile"/>
    3.31 -      </fileset>
    3.32 -      <manifest>
    3.33 -        <attribute name="Built-By" value="${user.name}"/>
    3.34 -	<attribute name="Main-Class" value="uk.ac.cam.cl.xeno.domctl.Main"/>
    3.35 -	<attribute name="Sealed" value="true"/>
    3.36 -      </manifest>
    3.37 -    </jar>
    3.38 -  </target>
    3.39 -
    3.40 -  <target name="test" depends="compile">
    3.41 -    <java fork="true" classname="uk.ac.cam.cl.xeno.domctl.Main">
    3.42 -      <classpath>
    3.43 -        <pathelement path="${build}"/>
    3.44 -      </classpath>
    3.45 -    </java>
    3.46 -  </target>
    3.47 -
    3.48 -  <target name="clean">
    3.49 -    <delete dir="${build}"/>
    3.50 -  </target>
    3.51 -</project>
    3.52 \ No newline at end of file
     4.1 --- a/tools/control/domctl	Wed Jul 09 11:18:53 2003 +0000
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,33 +0,0 @@
     4.4 -#!/bin/bash 
     4.5 -
     4.6 -if [ -z "$DEFAULTS_FILE" ] ; then DEFAULTS_FILE=domctl.xml ; fi
     4.7 -if [ -z "$DEFAULTS_PATH" ] ; then DEFAULTS_PATH=.:/etc:/var/lib/xen ; fi
     4.8 -if [ -z "$QUERY_DEV" ] ; then QUERY_DEV=eth0 ; fi
     4.9 -if [ -z "$IFCONFIG" ] ; then IFCONFIG=/sbin/ifconfig ; fi
    4.10 -if [ -z "$ROUTE" ] ; then ROUTE=/sbin/route ; fi
    4.11 -if [ -z "$JAVA" ] ; then JAVA=java ; fi
    4.12 -
    4.13 -if [ "$1" = "new" ] ; then
    4.14 -  if [ ! -x "$IFCONFIG" ]; then  
    4.15 -    echo Could not find executable $IFCONFIG
    4.16 -    exit 1
    4.17 -  fi
    4.18 -
    4.19 -  if [ ! -x "$ROUTE" ]; then
    4.20 -    echo Could not find executable $ROUTE
    4.21 -    exit 1
    4.22 -  fi
    4.23 -
    4.24 -  # Try to determine dom0 network settings to avoid hard-coding
    4.25 -  # particular machines in the defaults file
    4.26 -  LOCAL_IP=$(/sbin/ifconfig $QUERY_DEV | grep 'inet addr' | tr ':' '\t' | awk '{print $3}')
    4.27 -  LOCAL_MASK=$(/sbin/ifconfig $QUERY_DEV | grep 'Mask' | tr ':' '\t' | awk '{print $7}')
    4.28 -  LOCAL_ROUTE=$(/sbin/route -n | grep $QUERY_DEV | grep 'G' | awk '{print $2}')
    4.29 -fi
    4.30 -
    4.31 -
    4.32 -#ARGS="-DTEST -DDEFAULTS_FILE=$DEFAULTS_FILE -DDEFAULTS_PATH=$DEFAULTS_PATH -DLOCAL_IP=$LOCAL_IP -DLOCAL_MASK=$LOCAL_MASK -DLOCAL_ROUTE=$LOCAL_ROUTE"
    4.33 -ARGS="-DDEFAULTS_FILE=$DEFAULTS_FILE -DDEFAULTS_PATH=$DEFAULTS_PATH -DLOCAL_IP=$LOCAL_IP -DLOCAL_MASK=$LOCAL_MASK -DLOCAL_ROUTE=$LOCAL_ROUTE"
    4.34 -
    4.35 -
    4.36 -$JAVA $ARGS -jar $(dirname $0)/domctl.jar $*