Pkg xen devel - Feb 2010 - backport upstream pygrub fixes to allow booting squeeze default install?

Hi Bastian,

I'd like to propose backporting the following changesets from upstream
xen-unstable into the xen-3 package. With these it is possible to boot a
default installation of Squeeze (using d-i) in a domU using pygrub.

20480:c2c2e67b8198 pygrub: if default entry is "saved" then use first
entry.
20481:8f4e0adc2b3b pygrub: expands tabs before displaying menus.
20485:086a6a0c3f37 pygrub: factor generic Grub functionality into GrubConf base
classes
20486:6e32b7a3e802 pygrub: track the title of an item as an independant field
20487:c8caa281a75a pygrub: add basic support for parsing grub2 style grub.cfg
file
20585:2636e5619708 pygrub: improve grub 2 support

In addition I think the following needs to be added to
tools-pygrub-prefix.patch to allow the usual "bootloader=pygrub"
syntax
to continue working (#481105).

--- xen-3.orig/tools/python/xen/xend/osdep.py	2008-05-12 12:01:59.000000000
+0100
+++ xen-3/tools/python/xen/xend/osdep.py	2008-07-20 12:53:18.000000000 +0100
@@ -18,7 +18,8 @@
 # Use is subject to license terms.
 
 import os
 import commands
+import xen.util.auxbin
 
 _scripts_dir = {
     "Linux": "/etc/xen/scripts",
@@ -92,6 +93,6 @@
 
 scripts_dir = _get(_scripts_dir, "/etc/xen/scripts")
 xend_autorestart = _get(_xend_autorestart)
-pygrub_path = _get(_pygrub_path, "/usr/bin/pygrub")
+pygrub_path = _get(_pygrub_path, xen.util.auxbin.pathTo("pygrub"))
 vif_script = _get(_vif_script, "vif-bridge")
 lookup_balloon_stat = _get(_balloon_stat, _linux_balloon_stat)

If you agree with these changes then I think I have the necessary
account on alioth to make the change, unless you would prefer to do so
yourself, I can provide the patch to the package if necessary.

Ian.
-- 
Ian Campbell

Democracy is a government where you can say what you think even if you
don't think.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL:
<http://lists.alioth.debian.org/pipermail/pkg-xen-devel/attachments/20100218/dbb89a97/attachment.pgp>

Hi Bastian,

Any comment on the below?

Ian.

On Thu, 2010-02-18 at 22:16 +0000, Ian Campbell wrote: 
> Hi Bastian,
> 
> I'd like to propose backporting the following changesets from upstream
> xen-unstable into the xen-3 package. With these it is possible to boot a
> default installation of Squeeze (using d-i) in a domU using pygrub.
> 
> 20480:c2c2e67b8198 pygrub: if default entry is "saved" then use
first entry.
> 20481:8f4e0adc2b3b pygrub: expands tabs before displaying menus.
> 20485:086a6a0c3f37 pygrub: factor generic Grub functionality into GrubConf
base classes
> 20486:6e32b7a3e802 pygrub: track the title of an item as an independant
field
> 20487:c8caa281a75a pygrub: add basic support for parsing grub2 style
grub.cfg file
> 20585:2636e5619708 pygrub: improve grub 2 support
> 
> In addition I think the following needs to be added to
> tools-pygrub-prefix.patch to allow the usual "bootloader=pygrub"
syntax
> to continue working (#481105).
> 
> --- xen-3.orig/tools/python/xen/xend/osdep.py	2008-05-12 12:01:59.000000000
+0100
> +++ xen-3/tools/python/xen/xend/osdep.py	2008-07-20 12:53:18.000000000
+0100
> @@ -18,7 +18,8 @@
>  # Use is subject to license terms.
>  
>  import os
>  import commands
> +import xen.util.auxbin
>  
>  _scripts_dir = {
>      "Linux": "/etc/xen/scripts",
> @@ -92,6 +93,6 @@
>  
>  scripts_dir = _get(_scripts_dir, "/etc/xen/scripts")
>  xend_autorestart = _get(_xend_autorestart)
> -pygrub_path = _get(_pygrub_path, "/usr/bin/pygrub")
> +pygrub_path = _get(_pygrub_path,
xen.util.auxbin.pathTo("pygrub"))
>  vif_script = _get(_vif_script, "vif-bridge")
>  lookup_balloon_stat = _get(_balloon_stat, _linux_balloon_stat)
> 
> If you agree with these changes then I think I have the necessary
> account on alioth to make the change, unless you would prefer to do so
> yourself, I can provide the patch to the package if necessary.
> 
> Ian.
> _______________________________________________
> Pkg-xen-devel mailing list
> Pkg-xen-devel at lists.alioth.debian.org
> http://lists.alioth.debian.org/mailman/listinfo/pkg-xen-devel
-- 
Ian Campbell

May you have warm words on a cold evening,
a full mooon on a dark night,
and a smooth road all the way to your door.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL:
<http://lists.alioth.debian.org/pipermail/pkg-xen-devel/attachments/20100301/b4a35af7/attachment.pgp>

On Thu, Feb 18, 2010 at 10:16:00PM +0000, Ian Campbell
wrote:
> I'd like to propose backporting the following changesets from upstream
> xen-unstable into the xen-3 package. With these it is possible to boot a
> default installation of Squeeze (using d-i) in a domU using pygrub.
Why don't you ask Xen upstream to backport them into the 3.4 tree?
> In addition I think the following needs to be added to
> tools-pygrub-prefix.patch to allow the usual "bootloader=pygrub"
syntax
> to continue working (#481105).
Yep.

Bastian

-- 
Totally illogical, there was no chance.
		-- Spock, "The Galileo Seven", stardate 2822.3