[Pkg-xen-devel] Bug#502123: [PATCH] Re: xen-hypervisor-unstable-amd64: Post update from 3.2 -> 3.3, initrd which previously worked fails

[Anders Kaseorg]

tag 502123 patch
severity 502123 serious
thanks

Confirmed.  This regression was introduced by a copy-and-paste error in 
debian/patches/tools-python-xen-xm-relative-path.diff 
(svn://svn.debian.org/pkg-xen -r531).  Please apply this fix.

--- debian/changelog	2008-12-04 16:50:04.000000000 -0500
+++ debian/changelog	2008-12-04 16:59:09.000000000 -0500
@@ -1,3 +1,10 @@
+xen-unstable (3.3-unstable+hg17961-1.1) unstable; urgency=low
+
+  * Fix tools-python-xen-xm-relative-path.diff to avoid breaking
+    paravirtualized ramdisks.
+
+ -- Anders Kaseorg <andersk at mit.edu>  Thu, 04 Dec 2008 16:57:06 -0500
+
 xen-unstable (3.3-unstable+hg17961-1) unstable; urgency=low

   * New upstream snapshot.
--- debian/patches/tools-python-xen-xm-relative-path.diff	2008-12-04 16:50:04.000000000 -0500
+++ debian/patches/tools-python-xen-xm-relative-path.diff	2008-12-04 16:57:38.000000000 -0500
@@ -23,10 +23,10 @@
 +        config_image.append([ 'kernel', abspath(vals.kernel, 'boot') ])
      if vals.ramdisk:
 -        config_image.append([ 'ramdisk', os.path.abspath(vals.ramdisk) ])
-+        config_image.append([ 'ramdisk', abspath(vals.kernel, 'boot') ])
++        config_image.append([ 'ramdisk', abspath(vals.ramdisk, 'boot') ])
      if vals.loader:
 -        config_image.append([ 'loader', os.path.abspath(vals.loader) ])
-+        config_image.append([ 'loader', abspath(vals.kernel, 'boot') ])
++        config_image.append([ 'loader', abspath(vals.loader, 'boot') ])
      if vals.cmdline_ip:
          cmdline_ip = strip('ip=', vals.cmdline_ip)
          config_image.append(['ip', cmdline_ip])