This commit is contained in:
committed by
Git OBS Bridge
parent
8ae8ea2a74
commit
f5d6338f4d
@@ -1,9 +1,9 @@
|
||||
Change various example paths in the config files to match SUSE.
|
||||
|
||||
Index: xen-3.2-testing/tools/examples/xmexample1
|
||||
Index: xen-3.3.0-testing/tools/examples/xmexample1
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/tools/examples/xmexample1
|
||||
+++ xen-3.2-testing/tools/examples/xmexample1
|
||||
--- xen-3.3.0-testing.orig/tools/examples/xmexample1
|
||||
+++ xen-3.3.0-testing/tools/examples/xmexample1
|
||||
@@ -7,11 +7,13 @@
|
||||
#============================================================================
|
||||
|
||||
@@ -23,7 +23,7 @@ Index: xen-3.2-testing/tools/examples/xmexample1
|
||||
|
||||
# The domain build function. Default is 'linux'.
|
||||
#builder='linux'
|
||||
@@ -130,7 +132,7 @@ disk = [ 'phy:hda1,hda1,w' ]
|
||||
@@ -131,7 +133,7 @@ disk = [ 'phy:hda1,hda1,w' ]
|
||||
#hostname= "vm%d" % vmid
|
||||
|
||||
# Set root device.
|
||||
@@ -32,7 +32,7 @@ Index: xen-3.2-testing/tools/examples/xmexample1
|
||||
|
||||
# Root device for nfs.
|
||||
#root = "/dev/nfs"
|
||||
@@ -139,8 +141,8 @@ root = "/dev/hda1 ro"
|
||||
@@ -140,8 +142,8 @@ root = "/dev/hda1 ro"
|
||||
# Root directory on the nfs server.
|
||||
#nfs_root = '/full/path/to/root/directory'
|
||||
|
||||
@@ -43,10 +43,10 @@ Index: xen-3.2-testing/tools/examples/xmexample1
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Configure the behaviour when a domain exits. There are three 'reasons'
|
||||
Index: xen-3.2-testing/tools/examples/xmexample2
|
||||
Index: xen-3.3.0-testing/tools/examples/xmexample2
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/tools/examples/xmexample2
|
||||
+++ xen-3.2-testing/tools/examples/xmexample2
|
||||
--- xen-3.3.0-testing.orig/tools/examples/xmexample2
|
||||
+++ xen-3.3.0-testing/tools/examples/xmexample2
|
||||
@@ -35,11 +35,13 @@ xm_vars.var('vmid',
|
||||
xm_vars.check()
|
||||
|
||||
@@ -66,7 +66,7 @@ Index: xen-3.2-testing/tools/examples/xmexample2
|
||||
|
||||
# The domain build function. Default is 'linux'.
|
||||
#builder='linux'
|
||||
@@ -166,7 +168,7 @@ disk = [ 'phy:sda%d,sda1,w' % (7+vmid),
|
||||
@@ -167,7 +169,7 @@ disk = [ 'phy:sda%d,sda1,w' % (7+vmid),
|
||||
#hostname= "vm%d" % vmid
|
||||
|
||||
# Set root device.
|
||||
@@ -75,7 +75,7 @@ Index: xen-3.2-testing/tools/examples/xmexample2
|
||||
|
||||
# Root device for nfs.
|
||||
#root = "/dev/nfs"
|
||||
@@ -175,8 +177,8 @@ root = "/dev/sda1 ro"
|
||||
@@ -176,8 +178,8 @@ root = "/dev/sda1 ro"
|
||||
# Root directory on the nfs server.
|
||||
#nfs_root = '/full/path/to/root/directory'
|
||||
|
||||
@@ -86,10 +86,10 @@ Index: xen-3.2-testing/tools/examples/xmexample2
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Configure the behaviour when a domain exits. There are three 'reasons'
|
||||
Index: xen-3.2-testing/tools/examples/xmexample3
|
||||
Index: xen-3.3.0-testing/tools/examples/xmexample3
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/tools/examples/xmexample3
|
||||
+++ xen-3.2-testing/tools/examples/xmexample3
|
||||
--- xen-3.3.0-testing.orig/tools/examples/xmexample3
|
||||
+++ xen-3.3.0-testing/tools/examples/xmexample3
|
||||
@@ -35,11 +35,13 @@ xm_vars.var('vmid',
|
||||
xm_vars.check()
|
||||
|
||||
@@ -109,11 +109,11 @@ Index: xen-3.2-testing/tools/examples/xmexample3
|
||||
|
||||
# The domain build function. Default is 'linux'.
|
||||
#builder='linux'
|
||||
Index: xen-3.2-testing/tools/examples/xmexample.hvm
|
||||
Index: xen-3.3.0-testing/tools/examples/xmexample.hvm
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/tools/examples/xmexample.hvm
|
||||
+++ xen-3.2-testing/tools/examples/xmexample.hvm
|
||||
@@ -72,7 +72,7 @@ vif = [ 'type=ioemu, bridge=xenbr0' ]
|
||||
--- xen-3.3.0-testing.orig/tools/examples/xmexample.hvm
|
||||
+++ xen-3.3.0-testing/tools/examples/xmexample.hvm
|
||||
@@ -73,7 +73,7 @@ vif = [ 'type=ioemu, bridge=xenbr0' ]
|
||||
# and MODE is r for read-only, w for read-write.
|
||||
|
||||
#disk = [ 'phy:hda1,hda1,r' ]
|
||||
@@ -122,10 +122,10 @@ Index: xen-3.2-testing/tools/examples/xmexample.hvm
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Configure the behaviour when a domain exits. There are three 'reasons'
|
||||
Index: xen-3.2-testing/docs/man/xmdomain.cfg.pod.5
|
||||
Index: xen-3.3.0-testing/docs/man/xmdomain.cfg.pod.5
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/docs/man/xmdomain.cfg.pod.5
|
||||
+++ xen-3.2-testing/docs/man/xmdomain.cfg.pod.5
|
||||
--- xen-3.3.0-testing.orig/docs/man/xmdomain.cfg.pod.5
|
||||
+++ xen-3.3.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
|
||||
@@ -161,10 +161,10 @@ Index: xen-3.2-testing/docs/man/xmdomain.cfg.pod.5
|
||||
at hda1, which is the root filesystem.
|
||||
|
||||
=item I<NFS Root>
|
||||
Index: xen-3.2-testing/docs/man/xm.pod.1
|
||||
Index: xen-3.3.0-testing/docs/man/xm.pod.1
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/docs/man/xm.pod.1
|
||||
+++ xen-3.2-testing/docs/man/xm.pod.1
|
||||
--- xen-3.3.0-testing.orig/docs/man/xm.pod.1
|
||||
+++ xen-3.3.0-testing/docs/man/xm.pod.1
|
||||
@@ -106,8 +106,8 @@ soon as it is run.
|
||||
|
||||
=item I<without config file>
|
||||
@@ -173,6 +173,6 @@ Index: xen-3.2-testing/docs/man/xm.pod.1
|
||||
- kernel=/boot/vmlinuz-2.6.12.6-xenU \
|
||||
+ xm create /dev/null ramdisk=initrd-xen \
|
||||
+ kernel=/boot/vmlinuz-xen \
|
||||
name=ramdisk nics=0 vcpus=1 \
|
||||
name=ramdisk vif='' vcpus=1 \
|
||||
memory=64 root=/dev/ram0
|
||||
|
||||
|
Reference in New Issue
Block a user