1.1 --- a/.rootkeys	Wed Jun 16 13:30:35 2004 +0000
     1.2 +++ b/.rootkeys	Wed Jun 16 13:51:54 2004 +0000
     1.3 @@ -264,6 +264,7 @@ 40c9c469yrm31i60pGKslTi2Zgpotg tools/xen
     1.4  40c9c46925x-Rjb0Cv2f1-l2jZrPYg tools/xenmgr/lib/server/netif.py
     1.5  40c9c469ZqILEQ8x6yWy0_51jopiCg tools/xenmgr/lib/server/params.py
     1.6  40c9c469LNxLVizOUpOjEaTKKCm8Aw tools/xenmgr/lib/sxp.py
     1.7 +40d05079aFRp6NQdo5wIh5Ly31c0cg tools/xenmgr/lib/xm/__init__.py
     1.8  40cf2937gKQcATgXKGtNeWb1PDH5nA tools/xenmgr/lib/xm/create.py
     1.9  40cf2937isyS250zyd0Q2GuEDoNXfQ tools/xenmgr/lib/xm/main.py
    1.10  40cf2937PSslwBliN1g7ofDy2H_RhA tools/xenmgr/lib/xm/opts.py

     2.1 --- a/tools/Makefile	Wed Jun 16 13:30:35 2004 +0000
     2.2 +++ b/tools/Makefile	Wed Jun 16 13:51:54 2004 +0000
     2.3 @@ -32,5 +32,5 @@ clean:
     2.4  	$(MAKE) -C xentrace clean
     2.5  	$(MAKE) -C xenctl clean
     2.6  	$(MAKE) -C xend clean
     2.7 -	$(MAKE) -C xenmgr install
     2.8 +	$(MAKE) -C xenmgr clean
     2.9  

     4.1 --- a/tools/xenmgr/lib/xm/create.py	Wed Jun 16 13:30:35 2004 +0000
     4.2 +++ b/tools/xenmgr/lib/xm/create.py	Wed Jun 16 13:51:54 2004 +0000
     4.3 @@ -86,7 +86,7 @@ opts.opt('nics', val="N",
     4.4           use="Set the number of network interfaces.")
     4.5  
     4.6  opts.opt('vnet', val='VNET',
     4.7 -         fn=set_append_value, default=[],
     4.8 +         fn=append_value, default=[],
     4.9           use="""Define the vnets for the network interfaces.
    4.10           More than one vnet may be given, they are used in order.
    4.11           """)
    4.12 @@ -227,7 +227,7 @@ def preprocess_ip(opts):
    4.13            + ':' + opts.gateway
    4.14            + ':' + opts.netmask
    4.15            + ':' + opts.hostname
    4.16 -          + ':' : opts.interface
    4.17 +          + ':' + opts.interface
    4.18            + ':' + opts.dhcp)
    4.19      opts.cmdline_ip = ip
    4.20  

     5.1 --- a/tools/xenmgr/lib/xm/main.py	Wed Jun 16 13:30:35 2004 +0000
     5.2 +++ b/tools/xenmgr/lib/xm/main.py	Wed Jun 16 13:51:54 2004 +0000
     5.3 @@ -32,7 +32,7 @@ class Xm:
     5.4                  return 1
     5.5          return 0
     5.6  
     5.7 -    def unknown(self, args):
     5.8 +    def unknown(self, help, args):
     5.9          self.err("Unknown command: %s\nTry '%s help' for more information."
    5.10                   % (args[0], self.prog))
    5.11  

     6.1 --- a/tools/xenmgr/lib/xm/shutdown.py	Wed Jun 16 13:30:35 2004 +0000
     6.2 +++ b/tools/xenmgr/lib/xm/shutdown.py	Wed Jun 16 13:51:54 2004 +0000
     6.3 @@ -3,7 +3,7 @@ import sys
     6.4  import time
     6.5  
     6.6  from xenmgr.XendClient import server
     6.7 -from xenmgr.xm import opts
     6.8 +from xenmgr.xm.opts import *
     6.9  
    6.10  opts = Opts(use="""[options] [DOM]
    6.11  

     7.1 --- a/tools/xenmgr/setup.py	Wed Jun 16 13:30:35 2004 +0000
     7.2 +++ b/tools/xenmgr/setup.py	Wed Jun 16 13:51:54 2004 +0000
     7.3 @@ -9,6 +9,6 @@ setup(name            = PACKAGE,
     7.4        description     = 'Xen Management API',
     7.5        author          = 'Mike Wray',
     7.6        author_email    = 'mike.wray@hp.com',
     7.7 -      packages        = [ PACKAGE, PACKAGE + '.server' ],
     7.8 +      packages        = [ PACKAGE, PACKAGE + '.server', PACKAGE + '.xm' ],
     7.9        package_dir     = { PACKAGE: 'lib' },
    7.10        )