[PATCH] PV-GRUB: fix example file [Was: PV Grub Questions]

[Samuel Thibault <samuel.thibault@eu.citrix.com>]

Todd Deshane, le Thu 28 Aug 2008 11:13:10 -0400, a écrit :
> On Thu, Aug 28, 2008 at 10:43 AM, Samuel Thibault
> <samuel.thibault@eu.citrix.com> wrote:
> > Todd Deshane, le Tue 26 Aug 2008 15:57:50 -0400, a écrit :
> >> extra = "(hd0,1)/boot/grub/menu.lst"
> >> memory = 64
> >> vif = [ '' ]
> >> disk = [ 'tap:aio:/root/benchvm/bin/img-xen-guest/image-0.img,hda,w' ]
> >> root = "/dev/hda2 ro"
> >
> > Oh, that root option is the cause of the menu not showing up.  That
> > shouldn't be here, since it's in menu.lst itself.
> 
> Cool, that is the first step on the way. I think that should be changed in the
> xmexample.pv-grub file,

Gargl, I thought I had tested that file, but apparently not...  Should
be applied to the 3.3 tree too of course.

Samuel



pv-grub: fix example file
Apparently 64MB is too short for the domain builder.
No kernel option should be passed, as they are provided by menu.lst, and
would only confuse grub.

diff -r 51f868f2a29f tools/examples/xmexample.pv-grub
--- a/tools/examples/xmexample.pv-grub	Thu Aug 28 13:01:25 2008 +0100
+++ b/tools/examples/xmexample.pv-grub	Thu Aug 28 16:23:26 2008 +0100
@@ -25,7 +25,7 @@ extra = "(hd0,0)/boot/grub/menu.lst"
 # WARNING: Creating a domain with insufficient memory may cause out of
 #          memory errors. The domain needs enough memory to boot kernel
 #          and modules. Allocating less than 32MBs is not recommended.
-memory = 64
+memory = 128
 
 # A name for your domain. All domains must have different names.
 name = "ExampleDomain"
@@ -119,32 +119,6 @@ disk = [ 'phy:hda1,hda1,w' ]
 #vtpm = [ 'instance=1,backend=0' ]
 
 #----------------------------------------------------------------------------
-# Set the kernel command line for the new domain.
-# You only need to define the IP parameters and hostname if the domain's
-# IP config doesn't, e.g. in ifcfg-eth0 or via DHCP.
-# You can use 'extra' to set the runlevel and custom environment
-# variables used by custom rc scripts (e.g. VMID=, usr= ).
-
-# Set if you want dhcp to allocate the IP address.
-#dhcp="dhcp"
-# Set netmask.
-#netmask=
-# Set default gateway.
-#gateway=
-# Set the hostname.
-#hostname= "vm%d" % vmid
-
-# Set root device.
-root = "/dev/hda1 ro"
-
-# Root device for nfs.
-#root = "/dev/nfs"
-# The nfs server.
-#nfs_server = '192.0.2.1'  
-# Root directory on the nfs server.
-#nfs_root   = '/full/path/to/root/directory'
-
-#----------------------------------------------------------------------------
 # Configure the behaviour when a domain exits.  There are three 'reasons'
 # for a domain to stop: poweroff, reboot, and crash.  For each of these you
 # may specify: