argh, have to have device.map containing all of the devices we use (50904, 49299, 50800)

1 files changed, 17 insertions, 2 deletions

diff --git a/bootloader.py b/bootloader.py
index ee5c0e98c..90b30446b 100644
--- a/bootloader.py
+++ b/bootloader.py
@@ -433,11 +433,18 @@ class x86BootloaderInfo(bootloaderInfo):
                     break
                 i = i + 1
 
+        # keep track of which devices are used for the device.map
+        usedDevs = {}
+
         f.write('default=%s\n' % (default))
         f.write('timeout=10\n')
         f.write('splashimage=%s%sgrub/splash.xpm.gz\n'
                 % (grubbyPartitionName(bootDev), cfPath))
 
+        usedDevs[bootDev] = 1
+        usedDevs[rootDev] = 1
+        usedDevs[grubTarget] = 1
+
         if self.password:
             f.write('password --md5 %s\n' %(self.password))
         
@@ -465,6 +472,7 @@ class x86BootloaderInfo(bootloaderInfo):
 #            f.write('\tmakeactive\n')
             f.write('\tchainloader +1')
 	    f.write('\n')
+            usedDevs[device] = 1
 
 	f.close()
         os.chmod(instRoot + "/boot/grub/grub.conf", self.perms)
@@ -473,8 +481,15 @@ class x86BootloaderInfo(bootloaderInfo):
             f = open(instRoot + "/boot/grub/device.map", "w+")
             f.write("# this device map was generated by anaconda\n")
             f.write("(fd0)     /dev/fd0\n")
-            drive = getDiskPart(grubTarget)[0]
-            f.write("(%s)     /dev/%s\n" % (grubbyDiskName(drive), drive))
+            devs = usedDevs.keys()
+            devs.sort()
+            usedDevs = {}
+            for dev in devs:
+                drive = getDiskPart(dev)[0]
+                if usedDevs.has_key(drive):
+                    continue
+                f.write("(%s)     /dev/%s\n" % (grubbyDiskName(drive), drive))
+                usedDevs[drive] = 1
             f.close()
         
         if self.forceLBA32: