rpm/xen
SHA256
1
0
Fork 0
forked from pool/xen
Code Pull Requests Activity

Accepting request 49271 from Virtualization

Browse Source 
checked in (request 49271)

OBS-URL: https://build.opensuse.org/request/show/49271
OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=75
This commit is contained in:
OBS User autobuild
2010-09-27 22:07:20 +00:00
committed by Git OBS Bridge
parent 7e89789f0a
commit 06b9899ef9
186 changed files with 5183 additions and 2357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
xen-xmexample.diff
View File

@@ -1,9 +1,9 @@
Change various example paths in the config files to match SUSE.
Index: xen-4.0.1-testing/tools/examples/xmexample1
Index: 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
--- xen-4.0.0-testing.orig/tools/examples/xmexample1
+++ xen-4.0.0-testing/tools/examples/xmexample1
@@ -7,11 +7,13 @@
#============================================================================
@@ -43,10 +43,10 @@ Index: xen-4.0.1-testing/tools/examples/xmexample1
#----------------------------------------------------------------------------
# Configure the behaviour when a domain exits. There are three 'reasons'
Index: xen-4.0.1-testing/tools/examples/xmexample2
Index: 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
--- xen-4.0.0-testing.orig/tools/examples/xmexample2
+++ xen-4.0.0-testing/tools/examples/xmexample2
@@ -35,11 +35,13 @@ xm_vars.var('vmid',
xm_vars.check()
@@ -86,32 +86,33 @@ Index: xen-4.0.1-testing/tools/examples/xmexample2
#----------------------------------------------------------------------------
# Configure the behaviour when a domain exits. There are three 'reasons'
Index: xen-4.0.1-testing/tools/examples/xmexample3
Index: 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
--- xen-4.0.0-testing.orig/tools/examples/xmexample3
+++ xen-4.0.0-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.1-testing/tools/examples/xmexample.hvm
Index: 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
--- xen-4.0.0-testing.orig/tools/examples/xmexample.hvm
+++ xen-4.0.0-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.
@@ -121,11 +122,11 @@ Index: xen-4.0.1-testing/tools/examples/xmexample.hvm
#----------------------------------------------------------------------------
# Configure the behaviour when a domain exits. There are three 'reasons'
Index: xen-4.0.1-testing/docs/man/xmdomain.cfg.pod.5
Index: xen-4.0.0-testing/docs/man/xmdomain.cfg.pod.5
===================================================================
--- 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.
--- 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.
The kernel image for the domain. The format of the parameter is the
fully qualified path to the kernel image file,
@@ -160,10 +161,10 @@ Index: xen-4.0.1-testing/docs/man/xmdomain.cfg.pod.5
at hda1, which is the root filesystem.
=item I<NFS Root>
Index: xen-4.0.1-testing/docs/man/xm.pod.1
Index: 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
--- xen-4.0.0-testing.orig/docs/man/xm.pod.1
+++ xen-4.0.0-testing/docs/man/xm.pod.1
@@ -163,8 +163,8 @@ soon as it is run.
=item I<without config file>