Bastian Blank
2010-Apr-08 13:44 UTC
[Pkg-xen-changes] r740 - in trunk/xen-3/debian: . patches
Author: waldi
Date: Thu Apr 8 13:44:54 2010
New Revision: 740
Log:
* debian/changelog: Update.
* debian/patches/tools-python-xen-xm-relative-path.diff:
Also adjust path for bootloader setting.
Modified:
trunk/xen-3/debian/changelog
trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff
Modified: trunk/xen-3/debian/changelog
=============================================================================---
trunk/xen-3/debian/changelog Thu Apr 8 13:43:37 2010 (r739)
+++ trunk/xen-3/debian/changelog Thu Apr 8 13:44:54 2010 (r740)
@@ -1,6 +1,7 @@
xen-3 (3.4.3~rc3-2) UNRELEASED; urgency=low
* Again ship the complete version in the hypervisor.
+ * Fix path detection for bootloader. (closes: #481105)
-- Bastian Blank <waldi at debian.org> Mon, 01 Mar 2010 23:41:38 +0100
Modified: trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff Thu Apr 8
13:43:37 2010 (r739)
+++ trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff Thu Apr 8
13:44:54 2010 (r740)
@@ -48,3 +48,15 @@
if vals.vncpasswd is not None:
config_image.append([''vncpasswd'', vals.vncpasswd])
+@@ -980,10 +990,7 @@
+
+ config_image = configure_image(vals)
+ if vals.bootloader:
+- if vals.bootloader == "pygrub":
+- vals.bootloader = osdep.pygrub_path
+-
+- config.append([''bootloader'', vals.bootloader])
++ config.append([''bootloader'',
abspath(vals.bootloader, ''bin'')])
+ if vals.bootargs:
+ config.append([''bootloader_args'',
vals.bootargs])
+ else: