/[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.5 by slords, Wed Apr 5 01:20:27 2006 UTC Revision 1.10 by slords, Tue Jun 6 21:28:36 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 839  class x86BootloaderInfo(bootloaderInfo): Line 839  class x86BootloaderInfo(bootloaderInfo):
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:
843                usedDevs[dev] = 1
844    
845          if not os.access(instRoot + "/boot/grub/device.map", os.R_OK):          if not os.access(instRoot + "/boot/grub/device.map", os.R_OK):
846              f = open(instRoot + "/boot/grub/device.map", "w+")              f = open(instRoot + "/boot/grub/device.map", "w+")
847              f.write("# this device map was generated by anaconda\n")              f.write("# this device map was generated by anaconda\n")
# Line 886  class x86BootloaderInfo(bootloaderInfo): Line 889  class x86BootloaderInfo(bootloaderInfo):
889                            
890          cmds = []          cmds = []
891          for bootDev in bootDevs:          for bootDev in bootDevs:
892              gtPart = self.getMatchingPart(bootDev, grubTarget)              gtDisk = self.grubbyPartitionName(getDiskPart(bootDev)[0])
             gtDisk = self.grubbyPartitionName(getDiskPart(gtPart)[0])  
893              bPart = self.grubbyPartitionName(bootDev)              bPart = self.grubbyPartitionName(bootDev)
             cmd = "root %s" % (bPart,)  
             cmds.append(cmd)  
894    
895              stage1Target = gtDisk              stage1Target = gtDisk
896              if target == "partition":              if target == "partition":
897                  stage1Target = self.grubbyPartitionName(gtPart)                  stage1Target = self.grubbyPartitionName(bootDev)
898    
899              cmd = "install %s%s/stage1 d %s %s/stage2 p %s%s/grub.conf" % \              cmd = "root %s\nsetup %s" % (bPart, stage1Target)
                 (forcelba, grubPath, stage1Target, grubPath, bPart, grubPath)  
900              cmds.append(cmd)              cmds.append(cmd)
901                            
902          if not justConfigFile:          if not justConfigFile:
# Line 1082  class x86BootloaderInfo(bootloaderInfo): Line 1081  class x86BootloaderInfo(bootloaderInfo):
1081                      grubbyRootPart = self.grubbyPartitionName(rootDev)                      grubbyRootPart = self.grubbyPartitionName(rootDev)
1082                      break                      break
1083                                            
1084              cmd = "root %s\ninstall %s/stage1 d %s %s/stage2 p %s%s/grub.conf" \              cmd = "root %s\nsetup %s" % (grubbyRootPart, grubbyStage1Dev)
                 % (grubbyRootPart, grubPath, grubbyStage1Dev,  
                    grubPath, grubbyRootPart, grubPath)  
1085                    
1086              if not justConfigFile:              if not justConfigFile:
1087                  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