From aee5b5cdc91b441e04fa74a8abd174dc40457730 Mon Sep 17 00:00:00 2001 From: Shad L. Lords Date: Thu, 22 Oct 2009 09:24:38 -0600 Subject: [PATCH] Install grub correctly on raid1 devices --- bootloaderInfo.py | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/bootloaderInfo.py b/bootloaderInfo.py index 3c4f0cc..e5582f0 100644 --- a/bootloaderInfo.py +++ b/bootloaderInfo.py @@ -934,17 +934,14 @@ class x86BootloaderInfo(bootloaderInfo): cmds = [] for bootDev in bootDevs: - gtPart = self.getMatchingPart(bootDev, grubTarget) - gtDisk = self.grubbyPartitionName(getDiskPart(gtPart)[0]) + gtDisk = self.grubbyPartitionName(getDiskPart(bootDev)[0]) bPart = self.grubbyPartitionName(bootDev) - cmd = "root %s\n" % (bPart,) stage1Target = gtDisk if target == "partition": - stage1Target = self.grubbyPartitionName(gtPart) + stage1Target = self.grubbyPartitionName(bootDev) - cmd += "install %s%s/stage1 d %s %s/stage2 p %s%s/grub.conf" % \ - (forcelba, grubPath, stage1Target, grubPath, bPart, grubPath) + cmd = "root %s\nsetup %s" % (bPart, stage1Target) cmds.append(cmd) if not justConfigFile: @@ -1133,9 +1130,7 @@ class x86BootloaderInfo(bootloaderInfo): grubbyRootPart = self.grubbyPartitionName(rootDev) break - cmd = "root %s\ninstall %s/stage1 d %s %s/stage2 p %s%s/grub.conf" \ - % (grubbyRootPart, grubPath, grubbyStage1Dev, - grubPath, grubbyRootPart, grubPath) + cmd = "root %s\nsetup %s" % (grubbyRootPart, grubbyStage1Dev) if not justConfigFile: #log("GRUB command %s", cmd) -- 1.5.5.6