diff -up booty-0.80.6/bootloaderInfo.py.smepatches booty-0.80.6/bootloaderInfo.py --- booty-0.80.6/bootloaderInfo.py.smepatches 2009-05-30 12:13:40.000000000 -0600 +++ booty-0.80.6/bootloaderInfo.py 2009-05-30 12:28:42.000000000 -0600 @@ -934,17 +934,14 @@ 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 @@ 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) @@ -2084,9 +2079,9 @@ # returns a product name to use for the boot loader string # FIXME: this is based on the stuff from anaconda, but kind of crappy :-/ def getProductName(): - # try redhat-release first - if os.access("/etc/redhat-release", os.R_OK): - f = open("/etc/redhat-release", "r") + # try e-smith-release first + if os.access("/etc/e-smith-release", os.R_OK): + f = open("/etc/e-smith-release", "r") lines = f.readlines() f.close() for buf in lines: