1 |
--- booty-0.80.4/bootloaderInfo.py.smeserver 2008-03-18 16:54:24.000000000 -0600 |
--- booty-0.80.4/bootloaderInfo.py.smeserver 2008-03-18 16:54:24.000000000 -0600 |
2 |
+++ booty-0.80.4/bootloaderInfo.py 2008-03-18 17:00:52.000000000 -0600 |
+++ booty-0.80.4/bootloaderInfo.py 2008-03-18 17:00:52.000000000 -0600 |
3 |
@@ -929,14 +929,13 @@ |
@@ -929,8 +929,7 @@ |
4 |
if target == "partition": |
if target == "partition": |
5 |
stage1Target = self.grubbyPartitionName(gtPart) |
stage1Target = self.grubbyPartitionName(gtPart) |
6 |
|
|
10 |
cmds.append(cmd) |
cmds.append(cmd) |
11 |
|
|
12 |
if not justConfigFile: |
if not justConfigFile: |
13 |
- #log("GRUB commands:") |
@@ -1119,9 +1118,7 @@ |
|
- #for cmd in cmds: |
|
|
- # log("\t%s\n", cmd) |
|
|
+ log("GRUB commands:") |
|
|
+ for cmd in cmds: |
|
|
+ log("\t%s\n", cmd) |
|
|
if cfPath == "/": |
|
|
syncDataToDisk(bootDev, "/boot", instRoot) |
|
|
else: |
|
|
@@ -1119,12 +1118,10 @@ |
|
14 |
grubbyRootPart = self.grubbyPartitionName(rootDev) |
grubbyRootPart = self.grubbyPartitionName(rootDev) |
15 |
break |
break |
16 |
|
|
20 |
+ cmd = "root %s\nsetup %s" % (grubbyRootPart, grubbyStage1Dev,) |
+ cmd = "root %s\nsetup %s" % (grubbyRootPart, grubbyStage1Dev,) |
21 |
|
|
22 |
if not justConfigFile: |
if not justConfigFile: |
23 |
- #log("GRUB command %s", cmd) |
#log("GRUB command %s", cmd) |
|
+ log("GRUB command %s", cmd) |
|
|
|
|
|
# copy the stage files over into /boot |
|
|
rhpl.executil.execWithRedirect( "/sbin/grub-install", |
|
24 |
@@ -2070,9 +2067,9 @@ |
@@ -2070,9 +2067,9 @@ |
25 |
# returns a product name to use for the boot loader string |
# returns a product name to use for the boot loader string |
26 |
# FIXME: this is based on the stuff from anaconda, but kind of crappy :-/ |
# FIXME: this is based on the stuff from anaconda, but kind of crappy :-/ |