This commit is contained in:
OBS User unknown
committed by
Git OBS Bridge
Git OBS Bridge
parent
241ee9df04
commit
d7002a96b9
@@ -1,10 +1,10 @@
|
||||
Change various example paths in the config files to match SUSE.
|
||||
|
||||
Index: xen-unstable/tools/examples/xmexample1
|
||||
Index: xen-3.0.4-testing/tools/examples/xmexample1
|
||||
===================================================================
|
||||
--- xen-unstable.orig/tools/examples/xmexample1
|
||||
+++ xen-unstable/tools/examples/xmexample1
|
||||
@@ -7,11 +7,14 @@
|
||||
--- xen-3.0.4-testing.orig/tools/examples/xmexample1
|
||||
+++ xen-3.0.4-testing/tools/examples/xmexample1
|
||||
@@ -7,11 +7,13 @@
|
||||
#============================================================================
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
@@ -18,13 +18,12 @@ Index: xen-unstable/tools/examples/xmexample1
|
||||
+ramdisk = "/boot/initrd-xen"
|
||||
+
|
||||
+# Or use domUloader instead of kernel/ramdisk to get kernel from domU FS
|
||||
+#bootloader = "/usr/lib/xen/boot/domUlaoder.py"
|
||||
+#bootloader = "/usr/lib/xen/boot/domUloader.py"
|
||||
+#bootentry = "hda2:/vmlinuz-xen,/initrd-xen"
|
||||
+#bootentry = "/boot/vmlinuz-xen,/boot/initrd-xen"
|
||||
|
||||
# The domain build function. Default is 'linux'.
|
||||
#builder='linux'
|
||||
@@ -96,7 +99,7 @@ disk = [ 'phy:hda1,hda1,w' ]
|
||||
@@ -96,7 +98,7 @@ disk = [ 'phy:hda1,hda1,w' ]
|
||||
#hostname= "vm%d" % vmid
|
||||
|
||||
# Set root device.
|
||||
@@ -33,7 +32,7 @@ Index: xen-unstable/tools/examples/xmexample1
|
||||
|
||||
# Root device for nfs.
|
||||
#root = "/dev/nfs"
|
||||
@@ -105,8 +108,8 @@ root = "/dev/hda1 ro"
|
||||
@@ -105,8 +107,8 @@ root = "/dev/hda1 ro"
|
||||
# Root directory on the nfs server.
|
||||
#nfs_root = '/full/path/to/root/directory'
|
||||
|
||||
@@ -44,11 +43,11 @@ Index: xen-unstable/tools/examples/xmexample1
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Configure the behaviour when a domain exits. There are three 'reasons'
|
||||
Index: xen-unstable/tools/examples/xmexample2
|
||||
Index: xen-3.0.4-testing/tools/examples/xmexample2
|
||||
===================================================================
|
||||
--- xen-unstable.orig/tools/examples/xmexample2
|
||||
+++ xen-unstable/tools/examples/xmexample2
|
||||
@@ -35,11 +35,14 @@ xm_vars.var('vmid',
|
||||
--- xen-3.0.4-testing.orig/tools/examples/xmexample2
|
||||
+++ xen-3.0.4-testing/tools/examples/xmexample2
|
||||
@@ -35,11 +35,13 @@ xm_vars.var('vmid',
|
||||
xm_vars.check()
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
@@ -62,13 +61,12 @@ Index: xen-unstable/tools/examples/xmexample2
|
||||
+ramdisk = "/boot/initrd-xen"
|
||||
+
|
||||
+# Or use domUloader instead of kernel/ramdisk to get kernel from domU FS
|
||||
+#bootloader = "/usr/lib/xen/boot/domUlaoder.py"
|
||||
+#bootloader = "/usr/lib/xen/boot/domUloader.py"
|
||||
+#bootentry = "hda2:/vmlinuz-xen,/initrd-xen"
|
||||
+#bootentry = "/boot/vmlinuz-xen,/boot/initrd-xen"
|
||||
|
||||
# The domain build function. Default is 'linux'.
|
||||
#builder='linux'
|
||||
@@ -132,7 +135,7 @@ disk = [ 'phy:sda%d,sda1,w' % (7+vmid),
|
||||
@@ -132,7 +134,7 @@ disk = [ 'phy:sda%d,sda1,w' % (7+vmid),
|
||||
#hostname= "vm%d" % vmid
|
||||
|
||||
# Set root device.
|
||||
@@ -77,7 +75,7 @@ Index: xen-unstable/tools/examples/xmexample2
|
||||
|
||||
# Root device for nfs.
|
||||
#root = "/dev/nfs"
|
||||
@@ -141,8 +144,8 @@ root = "/dev/sda1 ro"
|
||||
@@ -141,8 +143,8 @@ root = "/dev/sda1 ro"
|
||||
# Root directory on the nfs server.
|
||||
#nfs_root = '/full/path/to/root/directory'
|
||||
|
||||
@@ -88,11 +86,11 @@ Index: xen-unstable/tools/examples/xmexample2
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Configure the behaviour when a domain exits. There are three 'reasons'
|
||||
Index: xen-unstable/tools/examples/xmexample3
|
||||
Index: xen-3.0.4-testing/tools/examples/xmexample3
|
||||
===================================================================
|
||||
--- xen-unstable.orig/tools/examples/xmexample3
|
||||
+++ xen-unstable/tools/examples/xmexample3
|
||||
@@ -35,11 +35,14 @@ xm_vars.var('vmid',
|
||||
--- xen-3.0.4-testing.orig/tools/examples/xmexample3
|
||||
+++ xen-3.0.4-testing/tools/examples/xmexample3
|
||||
@@ -35,11 +35,13 @@ xm_vars.var('vmid',
|
||||
xm_vars.check()
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
@@ -106,17 +104,16 @@ Index: xen-unstable/tools/examples/xmexample3
|
||||
+ramdisk = "/boot/initrd-xen"
|
||||
+
|
||||
+# Or use domUloader instead of kernel/ramdisk to get kernel from domU FS
|
||||
+#bootloader = "/usr/lib/xen/boot/domUlaoder.py"
|
||||
+#bootloader = "/usr/lib/xen/boot/domUloader.py"
|
||||
+#bootentry = "hda2:/vmlinuz-xen,/initrd-xen"
|
||||
+#bootentry = "/boot/vmlinuz-xen,/boot/initrd-xen"
|
||||
|
||||
# The domain build function. Default is 'linux'.
|
||||
#builder='linux'
|
||||
Index: xen-unstable/tools/examples/xmexample.hvm
|
||||
Index: xen-3.0.4-testing/tools/examples/xmexample.hvm
|
||||
===================================================================
|
||||
--- xen-unstable.orig/tools/examples/xmexample.hvm
|
||||
+++ xen-unstable/tools/examples/xmexample.hvm
|
||||
@@ -70,7 +70,7 @@ vif = [ 'type=ioemu, bridge=xenbr0' ]
|
||||
--- xen-3.0.4-testing.orig/tools/examples/xmexample.hvm
|
||||
+++ xen-3.0.4-testing/tools/examples/xmexample.hvm
|
||||
@@ -71,7 +71,7 @@ vif = [ 'type=ioemu, bridge=xenbr0' ]
|
||||
# and MODE is r for read-only, w for read-write.
|
||||
|
||||
#disk = [ 'phy:hda1,hda1,r' ]
|
||||
@@ -125,10 +122,10 @@ Index: xen-unstable/tools/examples/xmexample.hvm
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Configure the behaviour when a domain exits. There are three 'reasons'
|
||||
Index: xen-unstable/docs/man/xmdomain.cfg.pod.5
|
||||
Index: xen-3.0.4-testing/docs/man/xmdomain.cfg.pod.5
|
||||
===================================================================
|
||||
--- xen-unstable.orig/docs/man/xmdomain.cfg.pod.5
|
||||
+++ xen-unstable/docs/man/xmdomain.cfg.pod.5
|
||||
--- xen-3.0.4-testing.orig/docs/man/xmdomain.cfg.pod.5
|
||||
+++ xen-3.0.4-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
|
||||
@@ -164,10 +161,10 @@ Index: xen-unstable/docs/man/xmdomain.cfg.pod.5
|
||||
at hda1, which is the root filesystem.
|
||||
|
||||
=item I<NFS Root>
|
||||
Index: xen-unstable/docs/man/xm.pod.1
|
||||
Index: xen-3.0.4-testing/docs/man/xm.pod.1
|
||||
===================================================================
|
||||
--- xen-unstable.orig/docs/man/xm.pod.1
|
||||
+++ xen-unstable/docs/man/xm.pod.1
|
||||
--- xen-3.0.4-testing.orig/docs/man/xm.pod.1
|
||||
+++ xen-3.0.4-testing/docs/man/xm.pod.1
|
||||
@@ -102,8 +102,8 @@ soon as it is run.
|
||||
|
||||
=item I<without config file>
|
||||
|
||||
Reference in New Issue
Block a user