Don't put partitions into device.map

Rationalle:
<phcoder> pjones, mjg59: anaconda shouldn't include partitions in
          device.map
<pjones> phcoder: oh?  any particular reason why not, or is it just not
         a thing that should happen?
<phcoder> pjones: we don't use partitions in device.map. We use the
          corresponding ioctl's.
<pjones> oh, I see.  okay, sure.
<phcoder> pjones: such a line creates a disk "hd0\,1"
<pjones> where the \ means "don't parse the comma as a partition"?
<phcoder> hamzy: I've spoken with IBM guys. They are looking into as to
          why their system claims to be 100x40. Do you know a reliable
	  way to detect these systems which claim wrong resolution? If
	  so we can include a workaround
<phcoder> pjones: yes. We need it because of IEEE1275
<pjones> hah, of course.
<pjones>  /pci@1e,600000/
<phcoder> pjones: these entries claim that BIOS exposes separate
          partitions as fully-pledged disks.
<pjones> right, which is clearly not the case.

1 files changed, 5 insertions, 4 deletions

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index c900f79aa..a7c5a6120 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -1659,11 +1659,12 @@ class GRUB2(GRUB):
         dev_map = open(map_path, "w")
         dev_map.write("# this device map was generated by anaconda\n")
         devices = self.drives
-        if self.stage1_device not in devices:
-            devices.append(self.stage1_device)
+        if self.stage1_drive not in devices:
+            devices.append(self.stage1_drive)
 
-        if self.stage2_device not in devices:
-            devices.append(self.stage2_device)
+        for disk in self.stage2_device.disks:
+            if disk not in devices:
+                devices.append(disk)
 
         for drive in devices:
             dev_map.write("%s      %s\n" % (self.grub_device_name(drive),