merge from s390 branch

2 files changed, 48 insertions, 38 deletions

diff --git a/textw/fdasd_text.py b/textw/fdasd_text.py
index 83c89c0b5..1e55156d5 100644
--- a/textw/fdasd_text.py
+++ b/textw/fdasd_text.py
@@ -29,7 +29,7 @@ class fdasdPartitionWindow:
 
         fdisk_name = "fdasd"
         listboxtext = _("Choose a disk to run fdasd or dasdfmt on")
-        buttons = [ (_("OK"), "done"), (_("Edit Partitions"), "edit"),
+        buttons = [ (_("Next"), "done"), (_("Edit Partitions"), "edit"),
                     (_("Format DASD"), "dasdfmt"),
                     TEXT_BACK_BUTTON ]        
         drives =  diskset.driveList()        
@@ -93,7 +93,7 @@ class fdasdPartitionWindow:
 
             elif button == "done" or button == TEXT_BACK_CHECK:
                 diskset.refreshDevices(intf)
-                partitioning.checkNoDisks(diskset, intf)            
+                diskset.checkNoDisks(intf)            
                 partrequests.setFromDisk(diskset)
 
                 if len(diskset.disks.keys()) == 0:
@@ -113,7 +113,7 @@ class fdasdPartitionWindow:
         if button == TEXT_BACK_CHECK:
             return INSTALL_BACK
 
-        partitioning.checkNoDisks(diskset, intf)            
+        diskset.checkNoDisks(intf)            
         partrequests.setFromDisk(diskset)
         
         return INSTALL_OK
diff --git a/textw/zipl_text.py b/textw/zipl_text.py
index 907bce9a2..151c8e917 100644
--- a/textw/zipl_text.py
+++ b/textw/zipl_text.py
@@ -18,43 +18,47 @@ from rhpl.translate import _
 
 class ZiplWindow:
     def __call__(self, screen, dispatch, bl, fsset, diskSet):
-	t = TextboxReflowed(53,
-                         _("The z/IPL Boot Loader will now be installed "
-                           "on your system."
-                           "\n"
-                           "\n"
-                           "The root partition will be the one you "
-                           "selected previously in the partition setup."
-                           "\n"
-                           "\n"
-                           "The kernel used to start the machine will be "
-                           "the one to be installed by default."
-                           "\n"
-                           "\n"
-                           "If you wish to make changes later after "
-                           "the installation feel free to change the "
-                           "/etc/zipl.conf configuration file."
-                           "\n"
-                           "\n"
-                           "You can now enter any additional kernel parameters "
-                           "which your machine or your setup may require."))
+        t = TextboxReflowed(53,
+                         _("The z/IPL Boot Loader will be installed "
+                           "on your system after installations is complete. "
+                           "You can now enter any additional kernel and "
+                           "chandev parameters which your machine or your "
+                           "setup may require."))
 
-	entry = Entry(48, scroll = 1, returnExit = 1)
+        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():
-            entry.set(bl.args.get())
+            kernelentry.set(bl.args.get())
 
-	buttons = ButtonBar(screen, [TEXT_OK_BUTTON,
-			     TEXT_BACK_BUTTON ] )
+        if bl.args and bl.args.chandevget():
+            cdevs = bl.args.chandevget()
+            chandeventry1.set('')
+            chandeventry2.set('')
+            if len(cdevs) > 0:
+                chandeventry1.set(cdevs[0])
+            if len(cdevs) > 1:
+                chandeventry2.set(string.join(cdevs[1:],';'))
 
-	grid = GridFormHelp(screen, _("z/IPL Configuration"), 
-			    "zipl-s390", 1, 3)
-	grid.add(t, 0, 0)
+        buttons = ButtonBar(screen, [TEXT_OK_BUTTON,
+                            TEXT_BACK_BUTTON ] )
+
+        grid = GridFormHelp(screen, _("z/IPL Configuration"), 
+                            "zipl-s390", 1, 5)
+        grid.add(t, 0, 0)
+        sg = Grid(2, 1)
+        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.setField(Label(_("Chandev line ") + "1: "), 0, 0, anchorLeft=1)
+        sg.setField(chandeventry1, 1, 0, anchorLeft=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)
-	sg.setField(Label(_("Kernel Parameters") + ": "), 0, 0, anchorLeft=1)
-	sg.setField(entry, 1, 0, anchorLeft=1)
-	grid.add(sg, 0, 1, padding = (0, 1, 0, 1))
-	grid.add(buttons, 0, 2, growx = 1)
 
         result = grid.runOnce ()
         button = buttons.buttonPressed(result)
@@ -62,9 +66,15 @@ class ZiplWindow:
         if button == TEXT_BACK_CHECK:
             return INSTALL_BACK
 
-	if entry.value():
-            bl.args.set(string.strip(entry.value()))
-	else:
+        if kernelentry.value():
+            bl.args.set(string.strip(kernelentry.value()))
+        else:
             bl.args.set("")
 
-	return INSTALL_OK
+        cdevs = []
+        if chandeventry1.value():
+            cdevs.append(string.strip(chandeventry1.value()))
+        if chandeventry2.value():
+            cdevs.append(string.strip(chandeventry2.value()))
+        bl.args.chandevset(cdevs)
+        return INSTALL_OK