aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoger Pau Monne <roger.pau@entel.upc.edu>2011-07-21 14:41:18 +0100
committerRoger Pau Monne <roger.pau@entel.upc.edu>2011-07-21 14:41:18 +0100
commit91101aeab916f85b48db1eac3fb7092a03c09adf (patch)
treed89f347fbf1a1c2159bf76d319ecd9823c99d984
parent93e2a6c05e4f8aca9575adafbd7819439bdcd2f5 (diff)
downloadxen-91101aeab916f85b48db1eac3fb7092a03c09adf.tar.gz
xen-91101aeab916f85b48db1eac3fb7092a03c09adf.tar.bz2
xen-91101aeab916f85b48db1eac3fb7092a03c09adf.zip
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@entel.upc.edu> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com> xen-unstable changeset: 23629:89ce3439686b xen-unstable date: Tue Jun 28 13:56:53 2011 +0100
-rw-r--r--tools/python/xen/xend/XendBootloader.py2
1 files changed, 1 insertions, 1 deletions
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)