diff options
author | rac61@labyrinth.cl.cam.ac.uk <rac61@labyrinth.cl.cam.ac.uk> | 2003-07-09 11:21:28 +0000 |
---|---|---|
committer | rac61@labyrinth.cl.cam.ac.uk <rac61@labyrinth.cl.cam.ac.uk> | 2003-07-09 11:21:28 +0000 |
commit | d83d492b486c5ed60c864e2a80730abea5754b3c (patch) | |
tree | 5d8805bda0b40c56c26f6aaae7d0aac1439e38dd | |
parent | 2f18e9e92cf1101f62768887b0b2126e3392c74c (diff) | |
download | xen-d83d492b486c5ed60c864e2a80730abea5754b3c.tar.gz xen-d83d492b486c5ed60c864e2a80730abea5754b3c.tar.bz2 xen-d83d492b486c5ed60c864e2a80730abea5754b3c.zip |
bitkeeper revision 1.315 (3f0bfab8LOjeKZnavr_zYilEEFpUig)
Nuke remnants of domctl
-rw-r--r-- | .rootkeys | 2 | ||||
-rw-r--r-- | tools/control/Makefile | 13 | ||||
-rw-r--r-- | tools/control/build-dom.xml | 48 | ||||
-rwxr-xr-x | tools/control/domctl | 33 |
4 files changed, 0 insertions, 96 deletions
@@ -9,11 +9,9 @@ 3eb781edFwm_pW9FwnQACIe68viLOw tools/control/Makefile 3eca6a96a31IwaKtkEa4jmzwTWlm8Q tools/control/README-xenctl 3eb781fceEYkUi1XHKf2V0KX7si2JA tools/control/build-cmdline.xml -3eb781fcTp_LPQwaot3SSSehkaf4eg tools/control/build-dom.xml 3ec41f7cWCxQ8pdH8ZWqhhv-38qQ1w tools/control/build-xen.xml 3ec41f7ca6IBXDSe0HVcMPp3PPloOQ tools/control/build.properties 3ec4ebe0g_MI1VqkbbyNB8gt6m0Adg tools/control/docs/empty_dir -3eb781fcXf-WczEdAhnTpWfbR55jqA tools/control/domctl 3eb781fcabCKRogwxJA3-jJKstw9Vg tools/control/domctl.xml 3f042c35FzVap5QW0UBPnZ2ZM0l3QA tools/control/src/org/xenoserver/cmdline/CommandParser.java 3eb781fdNQvEJW3tNvovjqoN7GlePA tools/control/src/org/xenoserver/cmdline/Main.java diff --git a/tools/control/Makefile b/tools/control/Makefile index fcf244a445..b8ac064450 100644 --- a/tools/control/Makefile +++ b/tools/control/Makefile @@ -19,19 +19,6 @@ clean-cmdline: -domctl: FORCE - ant -buildfile build-dom.xml dist - -install-domctl: domctl - cp domctl.jar domctl ../../../install/bin - chmod 755 ../../../install/bin/domctl - -clean-domctl: - ant -buildfile build-dom.xml clean - rm -f domctl.jar - - - xenctl: FORCE (cd web/tmpl; make) ant -buildfile build-xen.xml dist diff --git a/tools/control/build-dom.xml b/tools/control/build-dom.xml deleted file mode 100644 index eaf7380f0c..0000000000 --- a/tools/control/build-dom.xml +++ /dev/null @@ -1,48 +0,0 @@ -<project name="domctl project" default="compile"> - <property name="src" location="src"/> - <property name="build" location="build-dom"/> - - <target name="init"> - <tstamp/> - <mkdir dir="${build}"/> - </target> - - <target name="compile" depends="init"> - <javac srcdir="${src}" destdir="${build}" debug="on"> - <include name="uk/ac/cam/cl/xeno/domctl/**"/> - </javac> - </target> - - <target name="dist" depends="compile"> - <jar jarfile="domctl.jar" - excludes="*~" - basedir="${build}"> - <fileset dir="${src}"> - <include name="uk/ac/cam/cl/xeno/domctl/**"/> - </fileset> - <fileset dir="."> - <include name="build-domctl.xml"/> - <include name="domctl"/> - <include name="domctl.xml"/> - <include name="Makefile"/> - </fileset> - <manifest> - <attribute name="Built-By" value="${user.name}"/> - <attribute name="Main-Class" value="uk.ac.cam.cl.xeno.domctl.Main"/> - <attribute name="Sealed" value="true"/> - </manifest> - </jar> - </target> - - <target name="test" depends="compile"> - <java fork="true" classname="uk.ac.cam.cl.xeno.domctl.Main"> - <classpath> - <pathelement path="${build}"/> - </classpath> - </java> - </target> - - <target name="clean"> - <delete dir="${build}"/> - </target> -</project>
\ No newline at end of file diff --git a/tools/control/domctl b/tools/control/domctl deleted file mode 100755 index 959f0cee75..0000000000 --- a/tools/control/domctl +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -if [ -z "$DEFAULTS_FILE" ] ; then DEFAULTS_FILE=domctl.xml ; fi -if [ -z "$DEFAULTS_PATH" ] ; then DEFAULTS_PATH=.:/etc:/var/lib/xen ; fi -if [ -z "$QUERY_DEV" ] ; then QUERY_DEV=eth0 ; fi -if [ -z "$IFCONFIG" ] ; then IFCONFIG=/sbin/ifconfig ; fi -if [ -z "$ROUTE" ] ; then ROUTE=/sbin/route ; fi -if [ -z "$JAVA" ] ; then JAVA=java ; fi - -if [ "$1" = "new" ] ; then - if [ ! -x "$IFCONFIG" ]; then - echo Could not find executable $IFCONFIG - exit 1 - fi - - if [ ! -x "$ROUTE" ]; then - echo Could not find executable $ROUTE - exit 1 - fi - - # Try to determine dom0 network settings to avoid hard-coding - # particular machines in the defaults file - LOCAL_IP=$(/sbin/ifconfig $QUERY_DEV | grep 'inet addr' | tr ':' '\t' | awk '{print $3}') - LOCAL_MASK=$(/sbin/ifconfig $QUERY_DEV | grep 'Mask' | tr ':' '\t' | awk '{print $7}') - LOCAL_ROUTE=$(/sbin/route -n | grep $QUERY_DEV | grep 'G' | awk '{print $2}') -fi - - -#ARGS="-DTEST -DDEFAULTS_FILE=$DEFAULTS_FILE -DDEFAULTS_PATH=$DEFAULTS_PATH -DLOCAL_IP=$LOCAL_IP -DLOCAL_MASK=$LOCAL_MASK -DLOCAL_ROUTE=$LOCAL_ROUTE" -ARGS="-DDEFAULTS_FILE=$DEFAULTS_FILE -DDEFAULTS_PATH=$DEFAULTS_PATH -DLOCAL_IP=$LOCAL_IP -DLOCAL_MASK=$LOCAL_MASK -DLOCAL_ROUTE=$LOCAL_ROUTE" - - -$JAVA $ARGS -jar $(dirname $0)/domctl.jar $* |