SHA256
1
0
forked from pool/xen

Updating link to change in openSUSE:Factory/xen revision 99.0

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=87c8ac43897718b61dbcbca0296d6c2a
This commit is contained in:
OBS User buildservice-autocommit
2010-09-27 22:07:21 +00:00
committed by Git OBS Bridge
parent 06b9899ef9
commit 163148b426
186 changed files with 2359 additions and 5185 deletions

View File

@@ -1,9 +1,9 @@
Change various example paths in the config files to match SUSE.
Index: xen-4.0.0-testing/tools/examples/xmexample1
Index: xen-4.0.1-testing/tools/examples/xmexample1
===================================================================
--- xen-4.0.0-testing.orig/tools/examples/xmexample1
+++ xen-4.0.0-testing/tools/examples/xmexample1
--- xen-4.0.1-testing.orig/tools/examples/xmexample1
+++ xen-4.0.1-testing/tools/examples/xmexample1
@@ -7,11 +7,13 @@
#============================================================================
@@ -43,10 +43,10 @@ Index: xen-4.0.0-testing/tools/examples/xmexample1
#----------------------------------------------------------------------------
# Configure the behaviour when a domain exits. There are three 'reasons'
Index: xen-4.0.0-testing/tools/examples/xmexample2
Index: xen-4.0.1-testing/tools/examples/xmexample2
===================================================================
--- xen-4.0.0-testing.orig/tools/examples/xmexample2
+++ xen-4.0.0-testing/tools/examples/xmexample2
--- xen-4.0.1-testing.orig/tools/examples/xmexample2
+++ xen-4.0.1-testing/tools/examples/xmexample2
@@ -35,11 +35,13 @@ xm_vars.var('vmid',
xm_vars.check()
@@ -86,33 +86,32 @@ Index: xen-4.0.0-testing/tools/examples/xmexample2
#----------------------------------------------------------------------------
# Configure the behaviour when a domain exits. There are three 'reasons'
Index: xen-4.0.0-testing/tools/examples/xmexample3
Index: xen-4.0.1-testing/tools/examples/xmexample3
===================================================================
--- xen-4.0.0-testing.orig/tools/examples/xmexample3
+++ xen-4.0.0-testing/tools/examples/xmexample3
--- xen-4.0.1-testing.orig/tools/examples/xmexample3
+++ xen-4.0.1-testing/tools/examples/xmexample3
@@ -35,11 +35,13 @@ xm_vars.var('vmid',
xm_vars.check()
#----------------------------------------------------------------------------
-# Kernel image file.
-kernel = "/path/to/domU/kernel"
-
-# Optional ramdisk.
-#ramdisk = "/boot/initrd.gz"
+# Kernel image file and (optional) ramdisk (initrd).
+kernel = "/boot/vmlinuz-xen"
+ramdisk = "/boot/initrd-xen"
+
-# Optional ramdisk.
-#ramdisk = "/boot/initrd.gz"
+# Or use domUloader instead of kernel/ramdisk to get kernel from domU FS
+#bootloader = "/usr/lib/xen/boot/domUloader.py"
+#bootentry = "hda2:/vmlinuz-xen,/initrd-xen"
# The domain build function. Default is 'linux'.
#builder='linux'
Index: xen-4.0.0-testing/tools/examples/xmexample.hvm
Index: xen-4.0.1-testing/tools/examples/xmexample.hvm
===================================================================
--- xen-4.0.0-testing.orig/tools/examples/xmexample.hvm
+++ xen-4.0.0-testing/tools/examples/xmexample.hvm
--- xen-4.0.1-testing.orig/tools/examples/xmexample.hvm
+++ xen-4.0.1-testing/tools/examples/xmexample.hvm
@@ -78,7 +78,7 @@ vif = [ 'type=ioemu, bridge=xenbr0' ]
# and MODE is r for read-only, w for read-write.
@@ -122,11 +121,11 @@ Index: xen-4.0.0-testing/tools/examples/xmexample.hvm
#----------------------------------------------------------------------------
# Configure the behaviour when a domain exits. There are three 'reasons'
Index: xen-4.0.0-testing/docs/man/xmdomain.cfg.pod.5
Index: xen-4.0.1-testing/docs/man/xmdomain.cfg.pod.5
===================================================================
--- xen-4.0.0-testing.orig/docs/man/xmdomain.cfg.pod.5
+++ xen-4.0.0-testing/docs/man/xmdomain.cfg.pod.5
@@ -38,13 +38,13 @@ file.
--- xen-4.0.1-testing.orig/docs/man/xmdomain.cfg.pod.5
+++ xen-4.0.1-testing/docs/man/xmdomain.cfg.pod.5
@@ -38,13 +38,13 @@ file.
The kernel image for the domain. The format of the parameter is the
fully qualified path to the kernel image file,
@@ -161,10 +160,10 @@ Index: xen-4.0.0-testing/docs/man/xmdomain.cfg.pod.5
at hda1, which is the root filesystem.
=item I<NFS Root>
Index: xen-4.0.0-testing/docs/man/xm.pod.1
Index: xen-4.0.1-testing/docs/man/xm.pod.1
===================================================================
--- xen-4.0.0-testing.orig/docs/man/xm.pod.1
+++ xen-4.0.0-testing/docs/man/xm.pod.1
--- xen-4.0.1-testing.orig/docs/man/xm.pod.1
+++ xen-4.0.1-testing/docs/man/xm.pod.1
@@ -163,8 +163,8 @@ soon as it is run.
=item I<without config file>