booty/sme8/booty-0.80.4-smeserver.patch

--- 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,14 +929,13 @@
             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:
-            #log("GRUB commands:")
-            #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 @@
                     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)
+                log("GRUB command %s", cmd)
 
                 # copy the stage files over into /boot
                 rhpl.executil.execWithRedirect( "/sbin/grub-install",
@@ -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:
1	--- 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
3	@@ -929,14 +929,13 @@
4	if target == "partition":
5	stage1Target = self.grubbyPartitionName(gtPart)
6
7	- cmd += "install %s%s/stage1 d %s %s/stage2 p %s%s/grub.conf" % \
8	- (forcelba, grubPath, stage1Target, grubPath, bPart, grubPath)
9	+ cmd += "setup %s" % (stage1Target,)
10	cmds.append(cmd)
11
12	if not justConfigFile:
13	- #log("GRUB commands:")
14	- #for cmd in cmds:
15	- # log("\t%s\n", cmd)
16	+ log("GRUB commands:")
17	+ for cmd in cmds:
18	+ log("\t%s\n", cmd)
19	if cfPath == "/":
20	syncDataToDisk(bootDev, "/boot", instRoot)
21	else:
22	@@ -1119,12 +1118,10 @@
23	grubbyRootPart = self.grubbyPartitionName(rootDev)
24	break
25
26	- cmd = "root %s\ninstall %s/stage1 d %s %s/stage2 p %s%s/grub.conf" \
27	- % (grubbyRootPart, grubPath, grubbyStage1Dev,
28	- grubPath, grubbyRootPart, grubPath)
29	+ cmd = "root %s\nsetup %s" % (grubbyRootPart, grubbyStage1Dev,)
30
31	if not justConfigFile:
32	- #log("GRUB command %s", cmd)
33	+ log("GRUB command %s", cmd)
34
35	# copy the stage files over into /boot
36	rhpl.executil.execWithRedirect( "/sbin/grub-install",
37	@@ -2070,9 +2067,9 @@
38	# returns a product name to use for the boot loader string
39	# FIXME: this is based on the stuff from anaconda, but kind of crappy :-/
40	def getProductName():
41	- # try redhat-release first
42	- if os.access("/etc/redhat-release", os.R_OK):
43	- f = open("/etc/redhat-release", "r")
44	+ # try e-smith-release first
45	+ if os.access("/etc/e-smith-release", os.R_OK):
46	+ f = open("/etc/e-smith-release", "r")
47	lines = f.readlines()
48	f.close()
49	for buf in lines: