bitkeeper revision 1.339 (3f0d6d60VROcPVK9573_fpTcuFCUXg)

Rename domctl.xml to xenctl.xml

9 files changed, 16 insertions, 12 deletions

diff --git a/tools/control/Makefile b/tools/control/Makefile
index c302e55b06..46ab52aa27 100644
--- a/tools/control/Makefile
+++ b/tools/control/Makefile
@@ -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 --git a/tools/control/build-cmdline.xml b/tools/control/build-cmdline.xml
index 4cf6fbfc39..56c2af143a 100644
--- a/tools/control/build-cmdline.xml
+++ b/tools/control/build-cmdline.xml
@@ -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 --git a/tools/control/doc/INSTALL-cmdline b/tools/control/doc/INSTALL-cmdline
index 74db2236ad..4290631e29 100644
--- a/tools/control/doc/INSTALL-cmdline
+++ b/tools/control/doc/INSTALL-cmdline
@@ -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 --git a/tools/control/doc/INSTALL-web b/tools/control/doc/INSTALL-web
index be97a0db0f..af844c0222 100644
--- a/tools/control/doc/INSTALL-web
+++ b/tools/control/doc/INSTALL-web
@@ -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 --git a/tools/control/doc/USAGE-cmdline b/tools/control/doc/USAGE-cmdline
index 189577987d..440e31e1d4 100644
--- a/tools/control/doc/USAGE-cmdline
+++ b/tools/control/doc/USAGE-cmdline
@@ -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 --git a/tools/control/src/org/xenoserver/cmdline/ParseDomainNew.java b/tools/control/src/org/xenoserver/cmdline/ParseDomainNew.java
index 080e8a3d2b..910ffc01ea 100644
--- a/tools/control/src/org/xenoserver/cmdline/ParseDomainNew.java
+++ b/tools/control/src/org/xenoserver/cmdline/ParseDomainNew.java
@@ -59,7 +59,7 @@ public class ParseDomainNew extends CommandParser {
     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 --git a/tools/control/src/org/xenoserver/control/Settings.java b/tools/control/src/org/xenoserver/control/Settings.java
index 4d9ca628cc..02cdbdecd6 100644
--- a/tools/control/src/org/xenoserver/control/Settings.java
+++ b/tools/control/src/org/xenoserver/control/Settings.java
@@ -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 --git a/tools/control/xenctl b/tools/control/xenctl
index 3516bc2fc8..9b30b81617 100755
--- a/tools/control/xenctl
+++ b/tools/control/xenctl
@@ -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 --git a/tools/control/domctl.xml b/tools/control/xenctl.xml
index 77bd5dcc7e..77bd5dcc7e 100644
--- a/tools/control/domctl.xml
+++ b/tools/control/xenctl.xml