From 91101aeab916f85b48db1eac3fb7092a03c09adf Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Thu, 21 Jul 2011 14:41:18 +0100 Subject: [PATCH] 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 Signed-off-by: Ian Jackson Committed-by: Ian Jackson xen-unstable changeset: 23629:89ce3439686b xen-unstable date: Tue Jun 28 13:56:53 2011 +0100 --- tools/python/xen/xend/XendBootloader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/python/xen/xend/XendBootloader.py b/tools/python/xen/xend/XendBootloader.py index 74c9a2ac19..f17428eaa4 100644 --- a/tools/python/xen/xend/XendBootloader.py +++ b/tools/python/xen/xend/XendBootloader.py @@ -44,7 +44,7 @@ def bootloader(blexec, disk, dom, quiet = False, blargs = '', kernel = '', 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)