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,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:
1	slords	1.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	slords	1.2	@@ -929,8 +929,7 @@
4	slords	1.1	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	slords	1.2	@@ -1119,9 +1118,7 @@
14	slords	1.1	grubbyRootPart = self.grubbyPartitionName(rootDev)
15			break
16
17			- cmd = "root %s\ninstall %s/stage1 d %s %s/stage2 p %s%s/grub.conf" \
18			- % (grubbyRootPart, grubPath, grubbyStage1Dev,
19			- grubPath, grubbyRootPart, grubPath)
20			+ cmd = "root %s\nsetup %s" % (grubbyRootPart, grubbyStage1Dev,)
21
22			if not justConfigFile:
23	slords	1.2	#log("GRUB command %s", cmd)
24	slords	1.1	@@ -2070,9 +2067,9 @@
25			# 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 :-/
27			def getProductName():
28			- # try redhat-release first
29			- if os.access("/etc/redhat-release", os.R_OK):
30			- f = open("/etc/redhat-release", "r")
31			+ # try e-smith-release first
32			+ if os.access("/etc/e-smith-release", os.R_OK):
33			+ f = open("/etc/e-smith-release", "r")
34			lines = f.readlines()
35			f.close()
36			for buf in lines: