* loader2/linuxrc.s390: Add OSA layer 2 network support for System Z

   platform (patch from Brad Hinson <bhinson@redhat.com>, #233357)

   * text/partition_text.py (AutoPartitionWindow): Modify device list
   to provide size and model information like we do in iw mode (#233606)

3 files changed, 32 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 50ccdf79c..c4123a4b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-03  David Cantrell  <dcantrell@redhat.com>
+
+	* loader2/linuxrc.s390: Add OSA layer 2 network support for System Z
+	platform (patch from Brad Hinson <bhinson@redhat.com>, #233357)
+
+	* text/partition_text.py (AutoPartitionWindow): Modify device list
+	to provide size and model information like we do in iw mode (#233606)
+
 2007-03-27  Dave Lehman  <dlehman@redhat.com>
 
 	* rescue.py (runRescue): fix selinux mount in rescue mode (#234137)
diff --git a/loader2/linuxrc.s390 b/loader2/linuxrc.s390
index d552a1c9c..e9a01edbd 100644
--- a/loader2/linuxrc.s390
+++ b/loader2/linuxrc.s390
@@ -139,6 +139,9 @@ setupdevice()
    if [ -n "$CTCPROT" -a "$NETTYPE" = "ctc" ]; then
       sysecho /sys/bus/ccwgroup/drivers/ctc/${SYSDIR}/protocol "$CTCPROT"
    fi
+   if [ -n "$LAYER2" -a "$NETTYPE" = "qeth" ]; then
+      sysecho /sys/bus/ccwgroup/drivers/qeth/${SYSDIR}/layer2 "$LAYER2"
+   fi
    sysecho /sys/bus/ccwgroup/drivers/${NETTYPE}/${SYSDIR}/online 1
 }
 
@@ -228,6 +231,12 @@ if [ "$NETTYPE" != "iucv" ]; then   # iucv is the only interface without ccw con
 			echo $"Press enter if you don't want to enter a portname"
 			read PORTNAME
 		fi
+ 		if [ -z "$LAYER2" ]; then
+			echo $"Enter the mode of operation for the OSA device"
+			echo $"0 for layer 3 mode (default)"
+			echo $"1 for layer 2 mode"
+			read LAYER2
+		fi
    fi
 fi
       
diff --git a/textw/partition_text.py b/textw/partition_text.py
index af3d5b6fe..49248a4be 100644
--- a/textw/partition_text.py
+++ b/textw/partition_text.py
@@ -1546,16 +1546,24 @@ class AutoPartitionWindow:
         disks = diskset.disks.keys()
         disks.sort()
         drivelist = CheckboxTree(height=3, scroll=1)
-        if not cleardrives or len(cleardrives) < 1:
-            for disk in disks:
-                drivelist.append(disk, selected = 1)
-        else:
-            for disk in disks:
+
+        for disk in disks:
+            size = getDeviceSizeMB(diskset.disks[disk].dev)
+            model = diskset.disks[disk].dev.model
+
+            if not cleardrives or len(cleardrives) < 1:
+                selected = 1
+            else:
                 if disk in cleardrives:
                     selected = 1
                 else:
                     selected = 0
-                drivelist.append(disk, selected = selected)
+
+            sizestr = "%8.0f MB" % (size,)
+            diskdesc = "%6s %s (%s)" % (disk, sizestr, model[:24],)
+
+            drivelist.append(diskdesc, selected = selected)
+
         subgrid.setField(drivelist, 0, 1)
         self.g.add(subgrid, 0, 3, (0,1,0,0))
 
@@ -1576,7 +1584,7 @@ class AutoPartitionWindow:
                 return INSTALL_BACK
 
             partitions.autoClearPartType = typebox.current()
-            partitions.autoClearPartDrives = self.drivelist.getSelection()
+            partitions.autoClearPartDrives = [self.drivelist.getSelection()[0].split()[0]]
 
             if queryAutoPartitionOK(intf, diskset, partitions):
                 self.shutdownUI()