1.1 --- a/.rootkeys	Thu Jul 10 13:35:28 2003 +0000
     1.2 +++ b/.rootkeys	Thu Jul 10 13:42:56 2003 +0000
     1.3 @@ -13,7 +13,6 @@ 3ec41f7ca6IBXDSe0HVcMPp3PPloOQ tools/con
     1.4  3f0d61da3O5gkcntbIOdUmN2-RcZbQ tools/control/doc/INSTALL-cmdline
     1.5  3eca6a96a31IwaKtkEa4jmzwTWlm8Q tools/control/doc/INSTALL-web
     1.6  3f0d61daCTHGCpQK0Brz3PAp80d_2Q tools/control/doc/USAGE-cmdline
     1.7 -3eb781fcabCKRogwxJA3-jJKstw9Vg tools/control/domctl.xml
     1.8  3f042c35FzVap5QW0UBPnZ2ZM0l3QA tools/control/src/org/xenoserver/cmdline/CommandParser.java
     1.9  3eb781fdNQvEJW3tNvovjqoN7GlePA tools/control/src/org/xenoserver/cmdline/Main.java
    1.10  3f042c35-TPgpCQViIaJzLts2-CnBw tools/control/src/org/xenoserver/cmdline/ParseDomainDestroy.java
    1.11 @@ -120,6 +119,7 @@ 3ec41f7ecn3uvsSrOVxKC8G8ACuulg tools/con
    1.12  3ec41f7ek1RffqN2yRUzSTkD5m1J6w tools/control/web/tmpl/xenohead.def
    1.13  3ec41f7e1ZpfCsgQ2qRJBooBn_iRtA tools/control/web/tmpl/xenostyle.css
    1.14  3eb781fc6vgq5yhkJRGDLY9gWWRY2A tools/control/xenctl
    1.15 +3eb781fcabCKRogwxJA3-jJKstw9Vg tools/control/xenctl.xml
    1.16  3eb781fdl4lXWYZzmqDDUAYhAThRqQ tools/internal/Makefile
    1.17  3eb781fdc539MQQm47rYRCCR3N5i-Q tools/internal/dom0_defs.h
    1.18  3ee609b3Yr4aggmLSKmhiIzT8-nURA tools/internal/dom0_ops.h

     2.1 --- a/tools/control/Makefile	Thu Jul 10 13:35:28 2003 +0000
     2.2 +++ b/tools/control/Makefile	Thu Jul 10 13:42:56 2003 +0000
     2.3 @@ -9,7 +9,7 @@ clean: clean-cmdline clean-web
     2.4  cmdline: FORCE
     2.5  	ant -buildfile build-cmdline.xml dist
     2.6  
     2.7 -install-cmdline: domctl
     2.8 +install-cmdline: cmdline
     2.9  	cp xenctl-cmdline.jar xenctl ../../../install/bin
    2.10  	chmod 755 ../../../install/bin/xenctl
    2.11  

     3.1 --- a/tools/control/build-cmdline.xml	Thu Jul 10 13:35:28 2003 +0000
     3.2 +++ b/tools/control/build-cmdline.xml	Thu Jul 10 13:42:56 2003 +0000
     3.3 @@ -25,7 +25,7 @@
     3.4        <fileset dir=".">
     3.5          <include name="build-cmdline.xml"/>
     3.6          <include name="xenctl"/>
     3.7 -        <include name="domctl.xml"/>
     3.8 +	<include name="xenctl.xml"/>
     3.9          <include name="Makefile"/>
    3.10        </fileset>
    3.11        <manifest>
    3.12 @@ -47,4 +47,4 @@
    3.13    <target name="clean">
    3.14      <delete dir="${build}"/>
    3.15    </target>
    3.16 -</project>
    3.17 \ No newline at end of file
    3.18 +</project>

     4.1 --- a/tools/control/doc/INSTALL-cmdline	Thu Jul 10 13:35:28 2003 +0000
     4.2 +++ b/tools/control/doc/INSTALL-cmdline	Thu Jul 10 13:42:56 2003 +0000
     4.3 @@ -3,9 +3,12 @@ To install command line interface:
     4.4  cd xeno.bk/tools/control
     4.5  make cmdline
     4.6  cp xenctl xenctl-cmdline.jar <dom0>/usr/local/bin
     4.7 -cp domctl.xml <dom0>/etc
     4.8 +cp xenctl.xml <dom0>/etc
     4.9  mkdir <dom0>/var/lib/xen
    4.10  
    4.11  First invocation of command line interface will give a warning about not being
    4.12  able to load the disk state from /var/lib/xen/vdstate.xml. This is ok, it'll
    4.13 -be created the first time you change any state in the virtual disk manager.
    4.14 \ No newline at end of file
    4.15 +be created the first time you change any state in the virtual disk manager.
    4.16 +
    4.17 +If you already have /etc/domctl.xml you can rename it to xenctl.xml to keep
    4.18 +your existing defaults.

     5.1 --- a/tools/control/doc/INSTALL-web	Thu Jul 10 13:35:28 2003 +0000
     5.2 +++ b/tools/control/doc/INSTALL-web	Thu Jul 10 13:42:56 2003 +0000
     5.3 @@ -29,11 +29,11 @@ to setup:
     5.4   ## install the xenctl web archive
     5.5   cp xeno.bk/tools/control/dist/xenctl-0.1-dev.war $CATALINA_HOME/webapps/xenctl.war
     5.6   # Only if you have not already copied this file for the command line tool
     5.7 - cp xeno.bk/tools/control/domctl.xml /etc
     5.8 + cp xeno.bk/tools/control/xenctl.xml /etc
     5.9   # If it doesn't exist:
    5.10   mkdir /var/lib/xen
    5.11  
    5.12 - ## either edit xi_tools_dir in domctl.xml or copy the binaries
    5.13 + ## either edit xi_tools_dir in xenctl.xml or copy the binaries
    5.14   ## unless already installed for the command line tool
    5.15   # find xeno.bk/tools/internal -perm +111 -type f -exec cp {} /usr/local/bin \;
    5.16  

     6.1 --- a/tools/control/doc/USAGE-cmdline	Thu Jul 10 13:35:28 2003 +0000
     6.2 +++ b/tools/control/doc/USAGE-cmdline	Thu Jul 10 13:42:56 2003 +0000
     6.3 @@ -27,10 +27,11 @@ Domain control
     6.4  --------------
     6.5  
     6.6  xenctl's command line interface is based on domctl. Defaults for domain
     6.7 -creation are found in /etc/domctl.xml.
     6.8 +creation are found in /etc/xenctl.xml which has the same format as the
     6.9 +old domctl.xml
    6.10  
    6.11  Creating a domain: xenctl domain new <parameters>
    6.12 -All parameters may be omitted to get defaults from domctl.xml, see help
    6.13 +All parameters may be omitted to get defaults from xenctl.xml, see help
    6.14  for ful details of available parameters.
    6.15  
    6.16  Starting a domain: xenctl domain start -n<domain_no>

     7.1 --- a/tools/control/domctl.xml	Thu Jul 10 13:35:28 2003 +0000
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,15 +0,0 @@
     7.4 -<?xml version="1.0"?>
     7.5 -<domctl_defaults>
     7.6 -<xi_tools_dir>/usr/local/bin/</xi_tools_dir>
     7.7 -<domain_name>XenoLinux</domain_name>
     7.8 -<domain_size_kb>16000</domain_size_kb>
     7.9 -<domain_image>./image</domain_image>
    7.10 -<domain_vifs>1</domain_vifs>
    7.11 -<root_device>/dev/nfs</root_device>
    7.12 -<nw_ip>=+</nw_ip>
    7.13 -<nw_gw>=</nw_gw>
    7.14 -<nw_mask>=</nw_mask>
    7.15 -<nw_nfs_server>128.232.32.20</nw_nfs_server>
    7.16 -<nw_nfs_root>/usr/groups/srgboot/moonraider/roots/root+</nw_nfs_root>
    7.17 -<max_domain_number>10</max_domain_number>
    7.18 -</domctl_defaults>

     8.1 --- a/tools/control/src/org/xenoserver/cmdline/ParseDomainNew.java	Thu Jul 10 13:35:28 2003 +0000
     8.2 +++ b/tools/control/src/org/xenoserver/cmdline/ParseDomainNew.java	Thu Jul 10 13:42:56 2003 +0000
     8.3 @@ -59,7 +59,7 @@ public class ParseDomainNew extends Comm
     8.4      public String getHelpText() {
     8.5          return "Create a new domain.  Note that most of the parameters will assume\n"
     8.6              + "default values: it should not be necessary to specify them all. See\n"
     8.7 -            + "domctl.xml for the current default settings.\n"
     8.8 +            + "xenctl.xml for the current default settings.\n"
     8.9              + "\n"
    8.10              + "General command line options:\n"
    8.11              + "  -n  Domain name                              domain_name\n"

     9.1 --- a/tools/control/src/org/xenoserver/control/Settings.java	Thu Jul 10 13:35:28 2003 +0000
     9.2 +++ b/tools/control/src/org/xenoserver/control/Settings.java	Thu Jul 10 13:42:56 2003 +0000
     9.3 @@ -10,7 +10,7 @@ import java.util.StringTokenizer;
     9.4  public final class Settings {
     9.5      /** Filename for the defaults file. */
     9.6      public static final String DEFAULTS_FILE =
     9.7 -        System.getProperty("DEFAULTS_FILE", "domctl.xml");
     9.8 +        System.getProperty("DEFAULTS_FILE", "xenctl.xml");
     9.9      /** Path to search for the defaults file. */
    9.10      public static final String DEFAULTS_PATH =
    9.11          System.getProperty("DEFAULTS_PATH", ".:/etc:/var/lib/xen");

    10.1 --- a/tools/control/xenctl	Thu Jul 10 13:35:28 2003 +0000
    10.2 +++ b/tools/control/xenctl	Thu Jul 10 13:42:56 2003 +0000
    10.3 @@ -1,6 +1,6 @@
    10.4  #!/bin/bash 
    10.5  
    10.6 -if [ -z "$DEFAULTS_FILE" ] ; then DEFAULTS_FILE=domctl.xml ; fi
    10.7 +if [ -z "$DEFAULTS_FILE" ] ; then DEFAULTS_FILE=xenctl.xml ; fi
    10.8  if [ -z "$DEFAULTS_PATH" ] ; then DEFAULTS_PATH=.:/etc:/var/lib/xen ; fi
    10.9  if [ -z "$QUERY_DEV" ] ; then QUERY_DEV=eth0 ; fi
   10.10  if [ -z "$IFCONFIG" ] ; then IFCONFIG=/sbin/ifconfig ; fi

    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/tools/control/xenctl.xml	Thu Jul 10 13:42:56 2003 +0000
    11.3 @@ -0,0 +1,15 @@
    11.4 +<?xml version="1.0"?>
    11.5 +<domctl_defaults>
    11.6 +<xi_tools_dir>/usr/local/bin/</xi_tools_dir>
    11.7 +<domain_name>XenoLinux</domain_name>
    11.8 +<domain_size_kb>16000</domain_size_kb>
    11.9 +<domain_image>./image</domain_image>
   11.10 +<domain_vifs>1</domain_vifs>
   11.11 +<root_device>/dev/nfs</root_device>
   11.12 +<nw_ip>=+</nw_ip>
   11.13 +<nw_gw>=</nw_gw>
   11.14 +<nw_mask>=</nw_mask>
   11.15 +<nw_nfs_server>128.232.32.20</nw_nfs_server>
   11.16 +<nw_nfs_root>/usr/groups/srgboot/moonraider/roots/root+</nw_nfs_root>
   11.17 +<max_domain_number>10</max_domain_number>
   11.18 +</domctl_defaults>