From 9d07f26af39e0166a0c14a7b6f0eb01c0b61ee83 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Tue, 27 Jul 2010 13:49:41 +0400 Subject: [PATCH] Fix grub() function. Similar section detect by 'root=/dev/' substring --- pym/cl_template.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/cl_template.py b/pym/cl_template.py index 74f4e41..e6781ee 100644 --- a/pym/cl_template.py +++ b/pym/cl_template.py @@ -3122,10 +3122,10 @@ os_disk_install not found mount point '\' and '\%s'")%mountPoint) reGrubEntry = re.compile("title.*?(?=title|$)", re.S | re.I ) grubconf = reRemoveComments.sub("",open(pathGrubConf,'r').read()) roothd = filter(lambda x: x[1] == '/', - zip(self.objVar.Get('os_disk_grub'), + zip(self.objVar.Get('os_disk_dev'), self.objVar.Get('os_install_disk_mount'))) if roothd: - roothd = "root (hd%s)" % roothd[0][0] + roothd = "root=%s" % roothd[0][0] replace = ("".join(filter(lambda x: not roothd in x, reGrubEntry.findall(grubconf)))).strip() textTemplateTmp = textTemplateTmp[:resS.start()] + replace +\