800917b5a2
- Update to Xen 4.1.2_rc2 c/s 23152 - bnc#716695 - domUs using tap devices will not start updated multi-xvdp.patch - Upstream patches from Jan 23803-intel-pmu-models.patch 23800-x86_64-guest-addr-range.patch 23795-intel-ich10-quirk.patch 23804-x86-IPI-counts.patch - bnc#706106 - Inconsistent reporting of VM names during migration xend-migration-domname-fix.patch - bnc#712823 - L3:Xen guest does not start reliable when rebooted xend-vcpu-affinity-fix.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=143
70 lines
2.7 KiB
Diff
70 lines
2.7 KiB
Diff
Index: xen-4.1.2-testing/tools/python/xen/xm/create.py
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/tools/python/xen/xm/create.py
|
|
+++ xen-4.1.2-testing/tools/python/xen/xm/create.py
|
|
@@ -73,7 +73,7 @@ gopts.opt('quiet', short='q',
|
|
use="Quiet.")
|
|
|
|
gopts.opt('path', val='PATH',
|
|
- fn=set_value, default='.:' + auxbin.xen_configdir(),
|
|
+ fn=set_value, default='.:' + auxbin.xen_configdir() + "/vm",
|
|
use="Search path for configuration scripts. "
|
|
"The value of PATH is a colon-separated directory list.")
|
|
|
|
Index: xen-4.1.2-testing/docs/man/xm.pod.1
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/docs/man/xm.pod.1
|
|
+++ xen-4.1.2-testing/docs/man/xm.pod.1
|
|
@@ -75,7 +75,7 @@ in the config file. See L<xmdomain.cfg>
|
|
format, and possible options used in either the configfile or for I<vars>.
|
|
|
|
I<configfile> can either be an absolute path to a file, or a relative
|
|
-path to a file located in /etc/xen.
|
|
+path to a file located in /etc/xen/vm.
|
|
|
|
Create will return B<as soon> as the domain is started. This B<does
|
|
not> mean the guest OS in the domain has actually booted, or is
|
|
@@ -156,7 +156,7 @@ B<EXAMPLES>
|
|
|
|
xm create Fedora4
|
|
|
|
-This creates a domain with the file /etc/xen/Fedora4, and returns as
|
|
+This creates a domain with the file /etc/xen/vm/Fedora4, and returns as
|
|
soon as it is run.
|
|
|
|
=item I<without config file>
|
|
Index: xen-4.1.2-testing/docs/man/xmdomain.cfg.pod.5
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/docs/man/xmdomain.cfg.pod.5
|
|
+++ xen-4.1.2-testing/docs/man/xmdomain.cfg.pod.5
|
|
@@ -4,9 +4,9 @@ xmdomain.cfg - xm domain config file for
|
|
|
|
=head1 SYNOPSIS
|
|
|
|
- /etc/xen/myxendomain
|
|
- /etc/xen/myxendomain2
|
|
- /etc/xen/auto/myxenautostarted
|
|
+ /etc/xen/auto/
|
|
+ /etc/xen/examples/
|
|
+ /etc/xen/vm/
|
|
|
|
=head1 DESCRIPTION
|
|
|
|
@@ -14,14 +14,14 @@ The B<xm>(1) program uses python executa
|
|
domains to create from scratch. Each of these config files needs to
|
|
contain a number of required options, and may specify many more.
|
|
|
|
-Domain configuration files live in /etc/xen by default, if you store
|
|
+Domain configuration files live in /etc/xen/vm by default. If you store
|
|
config files anywhere else the full path to the config file must be
|
|
specified in the I<xm create> command.
|
|
|
|
/etc/xen/auto is a special case. Domain config files in that
|
|
directory will be started automatically at system boot if the
|
|
xendomain init script is enabled. The contents of /etc/xen/auto
|
|
-should be symlinks to files in /etc/xen to allow I<xm create> to be
|
|
+should be symlinks to files in /etc/xen/vm to allow I<xm create> to be
|
|
used without full paths.
|
|
|
|
Options are specified by I<name = value> statements in the
|