--- booty-0.80.4/bootloaderInfo.py.smeserver 2008-03-18 16:54:24.000000000 -0600 +++ booty-0.80.4/bootloaderInfo.py 2008-03-18 17:00:52.000000000 -0600 @@ -929,8 +929,7 @@ if target == "partition": stage1Target = self.grubbyPartitionName(gtPart) - cmd += "install %s%s/stage1 d %s %s/stage2 p %s%s/grub.conf" % \ - (forcelba, grubPath, stage1Target, grubPath, bPart, grubPath) + cmd += "setup %s" % (stage1Target,) cmds.append(cmd) if not justConfigFile: @@ -1119,9 +1118,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) @@ -2070,9 +2067,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: