1 |
diff -up booty-0.80.6/bootloaderInfo.py.smepatches booty-0.80.6/bootloaderInfo.py |
2 |
--- booty-0.80.6/bootloaderInfo.py.smepatches 2009-04-14 09:07:28.000000000 -0600 |
3 |
+++ booty-0.80.6/bootloaderInfo.py 2009-04-14 09:12:44.000000000 -0600 |
4 |
@@ -1133,9 +1133,7 @@ class x86BootloaderInfo(bootloaderInfo): |
5 |
grubbyRootPart = self.grubbyPartitionName(rootDev) |
6 |
break |
7 |
|
8 |
- cmd = "root %s\ninstall %s/stage1 d %s %s/stage2 p %s%s/grub.conf" \ |
9 |
- % (grubbyRootPart, grubPath, grubbyStage1Dev, |
10 |
- grubPath, grubbyRootPart, grubPath) |
11 |
+ cmd = "root %s\nsetup %s" % (grubbyRootPart, grubbyStage1Dev) |
12 |
|
13 |
if not justConfigFile: |
14 |
#log("GRUB command %s", cmd) |
15 |
@@ -2084,9 +2082,9 @@ def getRootDevName(initrd, fsset, rootDe |
16 |
# returns a product name to use for the boot loader string |
17 |
# FIXME: this is based on the stuff from anaconda, but kind of crappy :-/ |
18 |
def getProductName(): |
19 |
- # try redhat-release first |
20 |
- if os.access("/etc/redhat-release", os.R_OK): |
21 |
- f = open("/etc/redhat-release", "r") |
22 |
+ # try e-smith-release first |
23 |
+ if os.access("/etc/e-smith-release", os.R_OK): |
24 |
+ f = open("/etc/e-smith-release", "r") |
25 |
lines = f.readlines() |
26 |
f.close() |
27 |
for buf in lines: |