[Xen-changelog] [xen-4.1-testing] xend: NetBSD portability fix for LVM raw volume names

[Xen patchbot-4.1-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Roger Pau Monne <roger.pau@xxxxxxxxxxxxx>
# Date 1311255678 -3600
# Node ID e164e8d89bb29d65bac2f5bd932a0de29d5422a1
# Parent  24fa05d9037db3b078ec8062dd3894998d278d81
xend: NetBSD portability fix for LVM raw volume names

Xen 4.1.1 was incorrectly passing /dev/rmapper/vg-lvname to pygrub
(notice the r in front of mapper), when it should pass
/dev/mapper/rvg-lvname (add the r to the last file) when using NetBSD.
I've patched it to work correctly. I'm attaching a unified diff with
the patch made against Xen 4.1.1 (it's a really simple modification).

From: Roger Pau Monne <roger.pau@xxxxxxxxxxxxx>
Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
xen-unstable changeset:   23629:89ce3439686b
xen-unstable date:        Tue Jun 28 13:56:53 2011 +0100
---


diff -r 24fa05d9037d -r e164e8d89bb2 tools/python/xen/xend/XendBootloader.py
--- a/tools/python/xen/xend/XendBootloader.py   Thu Jul 21 14:40:39 2011 +0100
+++ b/tools/python/xen/xend/XendBootloader.py   Thu Jul 21 14:41:18 2011 +0100
@@ -44,7 +44,7 @@
         raise VmError(msg)
 
     if os.uname()[0] == "NetBSD" and disk.startswith('/dev/'):
-       disk = disk.replace("/dev/", "/dev/r")
+       disk = "/r".join(disk.rsplit("/",1))
 
     mkdir.parents("/var/run/xend/boot/", stat.S_IRWXU)
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog