# HG changeset patch
# User rac61@labyrinth.cl.cam.ac.uk
# Date 1057844576 0
# Node ID 5e169da77286302cd9badb3cf85ba1f0e9dfa06d
# Parent  cae97f492816c6ad4f59fd6cb9f20e26928e3f1a
bitkeeper revision 1.339 (3f0d6d60VROcPVK9573_fpTcuFCUXg)

Rename domctl.xml to xenctl.xml


diff -r cae97f492816 -r 5e169da77286 .rootkeys
--- a/.rootkeys	Thu Jul 10 13:35:28 2003 +0000
+++ b/.rootkeys	Thu Jul 10 13:42:56 2003 +0000
@@ -13,7 +13,6 @@ 3ec41f7ca6IBXDSe0HVcMPp3PPloOQ tools/con
 3f0d61da3O5gkcntbIOdUmN2-RcZbQ tools/control/doc/INSTALL-cmdline
 3eca6a96a31IwaKtkEa4jmzwTWlm8Q tools/control/doc/INSTALL-web
 3f0d61daCTHGCpQK0Brz3PAp80d_2Q tools/control/doc/USAGE-cmdline
-3eb781fcabCKRogwxJA3-jJKstw9Vg tools/control/domctl.xml
 3f042c35FzVap5QW0UBPnZ2ZM0l3QA tools/control/src/org/xenoserver/cmdline/CommandParser.java
 3eb781fdNQvEJW3tNvovjqoN7GlePA tools/control/src/org/xenoserver/cmdline/Main.java
 3f042c35-TPgpCQViIaJzLts2-CnBw tools/control/src/org/xenoserver/cmdline/ParseDomainDestroy.java
@@ -120,6 +119,7 @@ 3ec41f7ecn3uvsSrOVxKC8G8ACuulg tools/con
 3ec41f7ek1RffqN2yRUzSTkD5m1J6w tools/control/web/tmpl/xenohead.def
 3ec41f7e1ZpfCsgQ2qRJBooBn_iRtA tools/control/web/tmpl/xenostyle.css
 3eb781fc6vgq5yhkJRGDLY9gWWRY2A tools/control/xenctl
+3eb781fcabCKRogwxJA3-jJKstw9Vg tools/control/xenctl.xml
 3eb781fdl4lXWYZzmqDDUAYhAThRqQ tools/internal/Makefile
 3eb781fdc539MQQm47rYRCCR3N5i-Q tools/internal/dom0_defs.h
 3ee609b3Yr4aggmLSKmhiIzT8-nURA tools/internal/dom0_ops.h
diff -r cae97f492816 -r 5e169da77286 tools/control/Makefile
--- a/tools/control/Makefile	Thu Jul 10 13:35:28 2003 +0000
+++ b/tools/control/Makefile	Thu Jul 10 13:42:56 2003 +0000
@@ -9,7 +9,7 @@ clean: clean-cmdline clean-web
 cmdline: FORCE
 	ant -buildfile build-cmdline.xml dist
 
-install-cmdline: domctl
+install-cmdline: cmdline
 	cp xenctl-cmdline.jar xenctl ../../../install/bin
 	chmod 755 ../../../install/bin/xenctl
 
diff -r cae97f492816 -r 5e169da77286 tools/control/build-cmdline.xml
--- a/tools/control/build-cmdline.xml	Thu Jul 10 13:35:28 2003 +0000
+++ b/tools/control/build-cmdline.xml	Thu Jul 10 13:42:56 2003 +0000
@@ -25,7 +25,7 @@
       <fileset dir=".">
         <include name="build-cmdline.xml"/>
         <include name="xenctl"/>
-        <include name="domctl.xml"/>
+	<include name="xenctl.xml"/>
         <include name="Makefile"/>
       </fileset>
       <manifest>
@@ -47,4 +47,4 @@
   <target name="clean">
     <delete dir="${build}"/>
   </target>
-</project>
\ No newline at end of file
+</project>
diff -r cae97f492816 -r 5e169da77286 tools/control/doc/INSTALL-cmdline
--- a/tools/control/doc/INSTALL-cmdline	Thu Jul 10 13:35:28 2003 +0000
+++ b/tools/control/doc/INSTALL-cmdline	Thu Jul 10 13:42:56 2003 +0000
@@ -3,9 +3,12 @@ To install command line interface:
 cd xeno.bk/tools/control
 make cmdline
 cp xenctl xenctl-cmdline.jar <dom0>/usr/local/bin
-cp domctl.xml <dom0>/etc
+cp xenctl.xml <dom0>/etc
 mkdir <dom0>/var/lib/xen
 
 First invocation of command line interface will give a warning about not being
 able to load the disk state from /var/lib/xen/vdstate.xml. This is ok, it'll
-be created the first time you change any state in the virtual disk manager.
\ No newline at end of file
+be created the first time you change any state in the virtual disk manager.
+
+If you already have /etc/domctl.xml you can rename it to xenctl.xml to keep
+your existing defaults.
diff -r cae97f492816 -r 5e169da77286 tools/control/doc/INSTALL-web
--- a/tools/control/doc/INSTALL-web	Thu Jul 10 13:35:28 2003 +0000
+++ b/tools/control/doc/INSTALL-web	Thu Jul 10 13:42:56 2003 +0000
@@ -29,11 +29,11 @@ to setup:
  ## install the xenctl web archive
  cp xeno.bk/tools/control/dist/xenctl-0.1-dev.war $CATALINA_HOME/webapps/xenctl.war
  # Only if you have not already copied this file for the command line tool
- cp xeno.bk/tools/control/domctl.xml /etc
+ cp xeno.bk/tools/control/xenctl.xml /etc
  # If it doesn't exist:
  mkdir /var/lib/xen
 
- ## either edit xi_tools_dir in domctl.xml or copy the binaries
+ ## either edit xi_tools_dir in xenctl.xml or copy the binaries
  ## unless already installed for the command line tool
  # find xeno.bk/tools/internal -perm +111 -type f -exec cp {} /usr/local/bin \;
 
diff -r cae97f492816 -r 5e169da77286 tools/control/doc/USAGE-cmdline
--- a/tools/control/doc/USAGE-cmdline	Thu Jul 10 13:35:28 2003 +0000
+++ b/tools/control/doc/USAGE-cmdline	Thu Jul 10 13:42:56 2003 +0000
@@ -27,10 +27,11 @@ Domain control
 --------------
 
 xenctl's command line interface is based on domctl. Defaults for domain
-creation are found in /etc/domctl.xml.
+creation are found in /etc/xenctl.xml which has the same format as the
+old domctl.xml
 
 Creating a domain: xenctl domain new <parameters>
-All parameters may be omitted to get defaults from domctl.xml, see help
+All parameters may be omitted to get defaults from xenctl.xml, see help
 for ful details of available parameters.
 
 Starting a domain: xenctl domain start -n<domain_no>
diff -r cae97f492816 -r 5e169da77286 tools/control/domctl.xml
--- a/tools/control/domctl.xml	Thu Jul 10 13:35:28 2003 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<domctl_defaults>
-<xi_tools_dir>/usr/local/bin/</xi_tools_dir>
-<domain_name>XenoLinux</domain_name>
-<domain_size_kb>16000</domain_size_kb>
-<domain_image>./image</domain_image>
-<domain_vifs>1</domain_vifs>
-<root_device>/dev/nfs</root_device>
-<nw_ip>=+</nw_ip>
-<nw_gw>=</nw_gw>
-<nw_mask>=</nw_mask>
-<nw_nfs_server>128.232.32.20</nw_nfs_server>
-<nw_nfs_root>/usr/groups/srgboot/moonraider/roots/root+</nw_nfs_root>
-<max_domain_number>10</max_domain_number>
-</domctl_defaults>
diff -r cae97f492816 -r 5e169da77286 tools/control/src/org/xenoserver/cmdline/ParseDomainNew.java
--- a/tools/control/src/org/xenoserver/cmdline/ParseDomainNew.java	Thu Jul 10 13:35:28 2003 +0000
+++ b/tools/control/src/org/xenoserver/cmdline/ParseDomainNew.java	Thu Jul 10 13:42:56 2003 +0000
@@ -59,7 +59,7 @@ public class ParseDomainNew extends Comm
     public String getHelpText() {
         return "Create a new domain.  Note that most of the parameters will assume\n"
             + "default values: it should not be necessary to specify them all. See\n"
-            + "domctl.xml for the current default settings.\n"
+            + "xenctl.xml for the current default settings.\n"
             + "\n"
             + "General command line options:\n"
             + "  -n  Domain name                              domain_name\n"
diff -r cae97f492816 -r 5e169da77286 tools/control/src/org/xenoserver/control/Settings.java
--- a/tools/control/src/org/xenoserver/control/Settings.java	Thu Jul 10 13:35:28 2003 +0000
+++ b/tools/control/src/org/xenoserver/control/Settings.java	Thu Jul 10 13:42:56 2003 +0000
@@ -10,7 +10,7 @@ import java.util.StringTokenizer;
 public final class Settings {
     /** Filename for the defaults file. */
     public static final String DEFAULTS_FILE =
-        System.getProperty("DEFAULTS_FILE", "domctl.xml");
+        System.getProperty("DEFAULTS_FILE", "xenctl.xml");
     /** Path to search for the defaults file. */
     public static final String DEFAULTS_PATH =
         System.getProperty("DEFAULTS_PATH", ".:/etc:/var/lib/xen");
diff -r cae97f492816 -r 5e169da77286 tools/control/xenctl
--- a/tools/control/xenctl	Thu Jul 10 13:35:28 2003 +0000
+++ b/tools/control/xenctl	Thu Jul 10 13:42:56 2003 +0000
@@ -1,6 +1,6 @@
 #!/bin/bash 
 
-if [ -z "$DEFAULTS_FILE" ] ; then DEFAULTS_FILE=domctl.xml ; fi
+if [ -z "$DEFAULTS_FILE" ] ; then DEFAULTS_FILE=xenctl.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
diff -r cae97f492816 -r 5e169da77286 tools/control/xenctl.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/control/xenctl.xml	Thu Jul 10 13:42:56 2003 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<domctl_defaults>
+<xi_tools_dir>/usr/local/bin/</xi_tools_dir>
+<domain_name>XenoLinux</domain_name>
+<domain_size_kb>16000</domain_size_kb>
+<domain_image>./image</domain_image>
+<domain_vifs>1</domain_vifs>
+<root_device>/dev/nfs</root_device>
+<nw_ip>=+</nw_ip>
+<nw_gw>=</nw_gw>
+<nw_mask>=</nw_mask>
+<nw_nfs_server>128.232.32.20</nw_nfs_server>
+<nw_nfs_root>/usr/groups/srgboot/moonraider/roots/root+</nw_nfs_root>
+<max_domain_number>10</max_domain_number>
+</domctl_defaults>