/[smeserver]/rpms/booty/sme8/booty-0.80.6-smepatches.patch
ViewVC logotype

Diff of /rpms/booty/sme8/booty-0.80.6-smepatches.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.1 by slords, Tue Apr 14 15:17:07 2009 UTC Revision 1.2 by slords, Sat May 30 18:30:09 2009 UTC
# Line 1  Line 1 
1  diff -up booty-0.80.6/bootloaderInfo.py.smepatches booty-0.80.6/bootloaderInfo.py  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  --- booty-0.80.6/bootloaderInfo.py.smepatches   2009-05-30 12:13:40.000000000 -0600
3  +++ booty-0.80.6/bootloaderInfo.py      2009-04-14 09:12:44.000000000 -0600  +++ booty-0.80.6/bootloaderInfo.py      2009-05-30 12:28:42.000000000 -0600
4  @@ -1133,9 +1133,7 @@ class x86BootloaderInfo(bootloaderInfo):  @@ -934,17 +934,14 @@
5                
6             cmds = []
7             for bootDev in bootDevs:
8    -            gtPart = self.getMatchingPart(bootDev, grubTarget)
9    -            gtDisk = self.grubbyPartitionName(getDiskPart(gtPart)[0])
10    +            gtDisk = self.grubbyPartitionName(getDiskPart(bootDev)[0])
11                 bPart = self.grubbyPartitionName(bootDev)
12    -            cmd = "root %s\n" % (bPart,)
13    
14                 stage1Target = gtDisk
15                 if target == "partition":
16    -                stage1Target = self.grubbyPartitionName(gtPart)
17    +                stage1Target = self.grubbyPartitionName(bootDev)
18    
19    -            cmd += "install %s%s/stage1 d %s %s/stage2 p %s%s/grub.conf" % \
20    -                (forcelba, grubPath, stage1Target, grubPath, bPart, grubPath)
21    +            cmd = "root %s\nsetup %s" % (bPart, stage1Target)
22                 cmds.append(cmd)
23                
24             if not justConfigFile:
25    @@ -1133,9 +1130,7 @@
26                       grubbyRootPart = self.grubbyPartitionName(rootDev)                       grubbyRootPart = self.grubbyPartitionName(rootDev)
27                       break                       break
28                                            
# Line 12  diff -up booty-0.80.6/bootloaderInfo.py. Line 33  diff -up booty-0.80.6/bootloaderInfo.py.
33                    
34               if not justConfigFile:               if not justConfigFile:
35                   #log("GRUB command %s", cmd)                   #log("GRUB command %s", cmd)
36  @@ -2084,9 +2082,9 @@ def getRootDevName(initrd, fsset, rootDe  @@ -2084,9 +2079,9 @@
37   # returns a product name to use for the boot loader string   # returns a product name to use for the boot loader string
38   # 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 :-/
39   def getProductName():   def getProductName():

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed