/[smeserver]/cdrom.image/updates/bootloaderInfo.py
ViewVC logotype

Diff of /cdrom.image/updates/bootloaderInfo.py

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

Revision 1.7 by slords, Wed Apr 5 05:13:40 2006 UTC Revision 1.9 by segfault-, Tue Jun 6 18:23:19 2006 UTC
# Line 16  Line 16 
16  # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
17  #  #
18    
 import isys  
19  import os, sys  import os, sys
20    import isys
21  import crypt  import crypt
22  import random  import random
23  import butil  import butil
# Line 838  class x86BootloaderInfo(bootloaderInfo): Line 838  class x86BootloaderInfo(bootloaderInfo):
838                
839          for dev in self.getPhysicalDevices(rootDev):          for dev in self.getPhysicalDevices(rootDev):
840              usedDevs[dev] = 1              usedDevs[dev] = 1
841          
842          for dev in bootDevs:          for dev in bootDevs:
843              usedDevs[dev] = 1              usedDevs[dev] = 1
844    
# Line 889  class x86BootloaderInfo(bootloaderInfo): Line 889  class x86BootloaderInfo(bootloaderInfo):
889                            
890          cmds = []          cmds = []
891          for bootDev in bootDevs:          for bootDev in bootDevs:
892              gtDisk = self.grubbyPartitionName(getDiskPart(bootDev)[0])              gtPart = self.getMatchingPart(bootDev, grubTarget)
893              bPart = self.grubbyPartitionName(bootDev)              gtDisk = self.grubbyPartitionName(getDiskPart(gtPart)[0])
894                bPart = self.grubbyPartitionName(bootDev)
895              cmd = "root %s" % (bPart,)              cmd = "root %s" % (bPart,)
896              cmds.append(cmd)              cmds.append(cmd)
897    
898              stage1Target = gtDisk              stage1Target = gtDisk
899              if target == "partition":              if target == "partition":
900                  stage1Target = self.grubbyPartitionName(bootDev)                  stage1Target = self.grubbyPartitionName(gtPart)
901    
902              cmd = "install %s/stage1 %s %s1+16 p %s%s/stage2 %s/grub.conf" % \              cmd = "install %s%s/stage1 d %s %s/stage2 p %s%s/grub.conf" % \
903                  (grubPath, stage1Target, stage1Target, bPart, grubPath, grubPath)                  (forcelba, grubPath, stage1Target, grubPath, bPart, grubPath)
904              cmds.append(cmd)              cmds.append(cmd)
905                            
906          if not justConfigFile:          if not justConfigFile:
# Line 1084  class x86BootloaderInfo(bootloaderInfo): Line 1085  class x86BootloaderInfo(bootloaderInfo):
1085                      grubbyRootPart = self.grubbyPartitionName(rootDev)                      grubbyRootPart = self.grubbyPartitionName(rootDev)
1086                      break                      break
1087                                            
1088              cmd = "root %s\ninstall %s/stage1 %s %s1+16 p %s%s/stage2 %s/grub.conf" \              cmd = "root %s\ninstall %s/stage1 d %s %s/stage2 p %s%s/grub.conf" \
1089                  % (grubbyRootPart, grubPath, stage1Dev, stage1Dev,                  % (grubbyRootPart, grubPath, grubbyStage1Dev,
1090                     grubbyRootPart, grubPath, grubPath)                     grubPath, grubbyRootPart, grubPath)
1091                    
1092              if not justConfigFile:              if not justConfigFile:
1093                  log("GRUB command %s", cmd)                  log("GRUB command %s", cmd)

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