first set of merges of s390 code to taroon branch. mail to follow to

anaconda-list with a brief run down of what was merged, what wasn't, etc.

s390 branch was tagged with taroon-merge-1 so that I can see what's new
after this merge as well

2 files changed, 17 insertions, 26 deletions

diff --git a/textw/partition_text.py b/textw/partition_text.py
index e224a823e..e0b66bb5a 100644
--- a/textw/partition_text.py
+++ b/textw/partition_text.py
@@ -1064,22 +1064,13 @@ class PartitionWindow:
             if type == "RAID":
                 self.editRaidRequest(request)
             elif type == "NEW":
-                if iutil.getArch() == "s390":
-                    self.intf.messageWindow(_("Error"),
-                        _("You must go back and use fdasd to initialize this partition"))
-                else:
-                    self.editPartitionRequest(request, isNew = 1)
+                self.editPartitionRequest(request, isNew = 1)
             else:
                 self.editPartitionRequest(request)
         
     def deleteCb(self):
         partition = self.lb.current()
 
-        if iutil.getArch() == "s390" and type(partition) != type("RAID"):
-            self.intf.messageWindow(_("Error"),
-                                    _("DASD partitions can only be deleted with fdasd"))
-            return
-            
         if doDeletePartitionByRequest(self.intf, self.partitions, partition):
             self.refresh()
         
@@ -1117,20 +1108,13 @@ class PartitionWindow:
                            col_label_align=[CENTER, CENTER,CENTER,CENTER,CENTER,CENTER])
         self.g.add(self.lb, 0, 1)
 
-        if iutil.getArch() == "s390":
-            self.bb = ButtonBar (screen, ((_("Edit"), "edit", "F3"),
-                                          (_("Delete"), "delete", "F4"),
-                                          (_("RAID"), "raid", "F11"),
-                                          TEXT_OK_BUTTON, TEXT_BACK_BUTTON))
-            screen.pushHelpLine( _("    F1-Help                 F3-Edit   F4-Delete    F5-Reset    F12-OK        "))
-        else:
-            self.bb = ButtonBar (screen, ((_("New"), "new", "F2"),
-                                          (_("Edit"), "edit", "F3"),
-                                          (_("Delete"), "delete", "F4"),
-                                          (_("RAID"), "raid", "F11"),
-                                          TEXT_OK_BUTTON, TEXT_BACK_BUTTON))
-            
-            screen.pushHelpLine( _("    F1-Help     F2-New      F3-Edit   F4-Delete    F5-Reset    F12-OK        "))
+        self.bb = ButtonBar (screen, ((_("New"), "new", "F2"),
+                                      (_("Edit"), "edit", "F3"),
+                                      (_("Delete"), "delete", "F4"),
+                                      (_("RAID"), "raid", "F11"),
+                                      TEXT_OK_BUTTON, TEXT_BACK_BUTTON))
+        
+        screen.pushHelpLine( _("    F1-Help     F2-New      F3-Edit   F4-Delete    F5-Reset    F12-OK        "))
 
         self.g.add(self.bb, 0, 2, (0, 1, 0, 0))
         self.g.addHotKey("F5")
diff --git a/textw/zipl_text.py b/textw/zipl_text.py
index 69a85f7f8..7503c5cf4 100644
--- a/textw/zipl_text.py
+++ b/textw/zipl_text.py
@@ -12,6 +12,8 @@
 #
 
 import iutil
+import isys
+import string
 from snack import *
 from constants_text import *
 from rhpl.translate import _
@@ -25,12 +27,16 @@ class ZiplWindow:
                            "chandev parameters which your machine or your "
                            "setup may require."))
 
+        kernelparms = ""
         kernelentry = Entry(48, scroll = 1, returnExit = 1)
         chandeventry1 = Entry(48, scroll = 1, returnExit = 1)
         chandeventry2 = Entry(48, scroll = 1, returnExit = 1)
 
         if bl.args and bl.args.get():
-            kernelentry.set(bl.args.get())
+            kernelparms = bl.args.get()
+        if isys.getDasdPorts():
+            kernelparms = kernelparms + " dasd=" + isys.getDasdPorts()
+        kernelentry.set(kernelparms)
 
         if bl.args and bl.args.chandevget():
             cdevs = bl.args.chandevget()
@@ -51,14 +57,15 @@ class ZiplWindow:
         sg.setField(Label(_("Kernel Parameters") + ": "), 0, 0, anchorLeft=1)
         sg.setField(kernelentry, 1, 0, anchorLeft=1)
         grid.add(sg, 0, 1, padding = (0, 1, 0, 1))
+        sg = Grid(2, 1)
         sg.setField(Label(_("Chandev line ") + "1: "), 0, 0, anchorLeft=1)
         sg.setField(chandeventry1, 1, 0, anchorLeft=1)
+        grid.add(sg, 0, 2, padding = (0, 1, 0, 1))
         sg = Grid(2, 1)
         sg.setField(Label(_("Chandev line ") + "2: "), 0, 0, anchorLeft=1)
         sg.setField(chandeventry2, 1, 0, anchorLeft=1)
         grid.add(sg, 0, 3, padding = (0, 1, 0, 1))
         grid.add(buttons, 0, 4, growx = 1)
-        sg = Grid(2, 1)
 
         result = grid.runOnce ()
         button = buttons.buttonPressed(result)