/[smeserver]/rpms/booty/sme7/raid-bootloader.patch
ViewVC logotype

Diff of /rpms/booty/sme7/raid-bootloader.patch

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

Revision 1.1 by slords, Tue Jun 12 14:52:50 2007 UTC Revision 1.2 by slords, Sat Dec 1 02:35:01 2007 UTC
# Line 134  diff -Nur -x '*.orig' -x '*.rej' booty-0 Line 134  diff -Nur -x '*.orig' -x '*.rej' booty-0
134  +                                                drive))  +                                                drive))
135               f.close()               f.close()
136                    
137           if self.forceLBA32:           args = "--stage2=/boot/grub/stage2 "
138  @@ -841,14 +878,22 @@  @@ -840,14 +877,22 @@
139               f.write("forcelba=0\n")               f.write("forcelba=0\n")
140           f.close()           f.close()
141                            
142  -       part = self.grubbyPartitionName(bootDev)  -       part = self.grubbyPartitionName(bootDev)
143  -       prefix = "%s/%s" % (self.grubbyPartitionName(bootDev), grubPath)  -       prefix = "%s/%s" % (self.grubbyPartitionName(bootDev), grubPath)
144  -       cmd = "root %s\ninstall %s%s/stage1 d %s %s/stage2 p %s%s/grub.conf" % \  -       cmd = "root %s\ninstall %s%s/stage1 d %s %s/stage2 p %s%s/grub.conf" % \
145  -           (part, forcelba, grubPath, self.grubbyPartitionName(grubTarget),  -           (part, args, grubPath, self.grubbyPartitionName(grubTarget),
146  -             grubPath, part, grubPath)  -             grubPath, part, grubPath)
147  +        cmds = []  +        cmds = []
148  +        for bootDev in bootDevs:  +        for bootDev in bootDevs:
# Line 164  diff -Nur -x '*.orig' -x '*.rej' booty-0 Line 164  diff -Nur -x '*.orig' -x '*.rej' booty-0
164    
165               # copy the stage files over into /boot               # copy the stage files over into /boot
166               rhpl.executil.execWithRedirect( "/sbin/grub-install",               rhpl.executil.execWithRedirect( "/sbin/grub-install",
167  @@ -866,7 +911,8 @@  @@ -865,7 +910,8 @@
168    
169               # really install the bootloader               # really install the bootloader
170              p = os.pipe()              p = os.pipe()
# Line 174  diff -Nur -x '*.orig' -x '*.rej' booty-0 Line 174  diff -Nur -x '*.orig' -x '*.rej' booty-0
174              os.close(p[1])              os.close(p[1])
175              rhpl.executil.execWithRedirect('/sbin/grub' ,              rhpl.executil.execWithRedirect('/sbin/grub' ,
176                                      [ "grub",  "--batch", "--no-floppy",                                      [ "grub",  "--batch", "--no-floppy",
177  @@ -1045,40 +1091,64 @@  @@ -1044,41 +1090,64 @@
178              bootDev = fsset.getEntryByMountPoint("/")              bootDev = fsset.getEntryByMountPoint("/")
179              grubPath = "/boot/grub"              grubPath = "/boot/grub"
180              cfPath = "/boot/"              cfPath = "/boot/"
# Line 182  diff -Nur -x '*.orig' -x '*.rej' booty-0 Line 182  diff -Nur -x '*.orig' -x '*.rej' booty-0
182    
183  -       part = self.grubbyPartitionName(bootDev)  -       part = self.grubbyPartitionName(bootDev)
184  -       prefix = "%s/%s" % (self.grubbyPartitionName(bootDev), grubPath)  -       prefix = "%s/%s" % (self.grubbyPartitionName(bootDev), grubPath)
185  -       cmd = "root %s\ninstall %s/stage1 d %s %s/stage2 p %s%s/grub.conf" % \  -       args = "--stage2=/boot/grub/stage2 "
186  -              (part, grubPath, self.grubbyPartitionName(theDev[5:]),  -       cmd = "root %s\ninstall %s%s/stage1 d %s %s/stage2 p %s%s/grub.conf" % \
187    -              (part, args, grubPath, self.grubbyPartitionName(theDev[5:]),
188  -               grubPath, part, grubPath)  -               grubPath, part, grubPath)
189  -          -        
190  -       if not justConfigFile:  -       if not justConfigFile:

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