b3dd26fbdf
SLES 11 xm-create-xflag.patch - Minor enhancement to xen-updown.sh sysconfig hook OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=23
32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
Index: xen-3.4.1-testing/tools/python/xen/xm/create.py
|
|
===================================================================
|
|
--- xen-3.4.1-testing.orig/tools/python/xen/xm/create.py
|
|
+++ xen-3.4.1-testing/tools/python/xen/xm/create.py
|
|
@@ -37,7 +37,7 @@ from xen.xend.server.DevConstants import
|
|
from xen.util import blkif
|
|
from xen.util import vscsi_util
|
|
import xen.util.xsm.xsm as security
|
|
-from xen.xm.main import serverType, SERVER_XEN_API, get_single_vm
|
|
+from xen.xm.main import serverType, SERVER_XEN_API, SERVER_LEGACY_XMLRPC, get_single_vm
|
|
from xen.util import utils
|
|
|
|
from xen.xm.opts import *
|
|
@@ -1351,7 +1351,7 @@ def main(argv):
|
|
except IOError, exn:
|
|
raise OptionError("Cannot read file %s: %s" % (config, exn[1]))
|
|
|
|
- if serverType == SERVER_XEN_API:
|
|
+ if serverType == SERVER_XEN_API or serverType == SERVER_LEGACY_XMLRPC:
|
|
from xen.xm.xenapi_create import sxp2xml
|
|
sxp2xml_inst = sxp2xml()
|
|
doc = sxp2xml_inst.convert_sxp_to_xml(config, transient=True)
|
|
@@ -1359,7 +1359,7 @@ def main(argv):
|
|
if opts.vals.dryrun and not opts.is_xml:
|
|
SXPPrettyPrint.prettyprint(config)
|
|
|
|
- if opts.vals.xmldryrun and serverType == SERVER_XEN_API:
|
|
+ if opts.vals.xmldryrun:
|
|
from xml.dom.ext import PrettyPrint as XMLPrettyPrint
|
|
XMLPrettyPrint(doc)
|
|
|