[Pkg-escience-soc2009] [SCM] Tool for creating VM images. branch, master, updated. ea87421e5c330344615fd465660cb6196d51caa6

[Steffen Moeller]

The following commit has been merged in the master branch:
commit f69dab51cbc6be1914d3d8889d1198ced80b5b5c
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Mon Jul 13 01:18:42 2009 +0200

    Fixed assignment of hd0,0 as root device

diff --git a/VMBuilder/plugins/debian/lenny.py b/VMBuilder/plugins/debian/lenny.py
index 9405cab..dcef1c8 100644
--- a/VMBuilder/plugins/debian/lenny.py
+++ b/VMBuilder/plugins/debian/lenny.py
@@ -112,5 +112,5 @@ class Lenny(Etch):
     def fix_grub_menu_lst_root(self):
         # Extremely dirty hack to fix the root parameters in menu.lst to (hd0,0)
         bootdev = disk.bootpart(self.vm.disks)
-        run_cmd('sed', '-ie', 's/(hd0,1)/(hd0,0)/g', '%s/boot/grub/menu.lst' % self.destdir)
+        run_cmd('sed', '-ie', 's/root[ \t]*\([^)]*\)/(hd0,0)/g', '%s/boot/grub/menu.lst' % self.destdir)
         

-- 
Tool for creating VM images.