merge from s390 branch

1 files changed, 32 insertions, 8 deletions

diff --git a/iw/fdasd_gui.py b/iw/fdasd_gui.py
index 706535ec9..81ac0a327 100644
--- a/iw/fdasd_gui.py
+++ b/iw/fdasd_gui.py
@@ -26,6 +26,7 @@ class FDasdWindow (InstallWindow):
 	InstallWindow.__init__ (self, ics)
         self.fdasd_name = _("fdasd")
         self.selectlabel = _("Select drive to run fdasd on")
+        self.drive = None
 
         ics.setTitle (self.fdasd_name)
         ics.readHTML ("usefdasd-s390")
@@ -55,11 +56,15 @@ class FDasdWindow (InstallWindow):
 #        self.ics.setHelpEnabled (1)
 
 
-    def button_clicked (self, widget, drive):
+    def row_selected (self, clist, row, column, event):
+        self.drive = clist.get_text(row, column)
+
+    def fdasd_button_clicked (self, widget):
+        if self.drive == None:
+            return
         zvt = ZvtTerm (80, 24)
         zvt.set_del_key_swap(TRUE)
         zvt.connect ("child_died", self.child_died, widget)
-        self.drive = drive
 
 
         # free our fd's to the hard drive -- we have to 
@@ -70,20 +75,27 @@ class FDasdWindow (InstallWindow):
             path = "/usr/sbin/fdasd"
             
         
-	isys.makeDevInode(drive, '/tmp/' + drive)
+	isys.makeDevInode(self.drive, '/tmp/' + self.drive)
 
         if zvt.forkpty() == 0:
             env = os.environ
-            os.execve (path, (path, '/tmp/' + drive), env)
+            os.execve (path, (path, '/tmp/' + self.drive), env)
         zvt.show ()
 
         self.windowContainer.remove (self.buttonBox)
         self.windowContainer.pack_start (zvt)
 
         self.ics.readHTML ("usefdasd-s390")
-	self.ics.setPrevEnabled (0)
+        self.ics.setPrevEnabled (0)
         self.ics.setNextEnabled (0)
 
+    def dasdfmt_button_clicked (self, widget):
+       rc = self.intf.messageWindow(_("Warning"), _("Formating the selected "
+            "DASD device will destroy all contents of the device. Do you "
+            "really want to format the selected DASD device?"), "yesno")
+       if rc == 1:
+           self.diskset.dasdFmt(self.intf, self.drive)
+
     # FdasdWindow tag="fdasd"
     def getScreen (self, diskset, partrequests, intf):
         self.diskset = diskset
@@ -101,13 +113,25 @@ class FDasdWindow (InstallWindow):
         # close all references we had to the diskset
         self.diskset.closeDevices()
 
+        clist = GtkCList(1, ["Available DASD devices:"])
         for drive in drives:
-            button = GtkButton (drive)
-            button.connect ("clicked", self.button_clicked, drive)
-            box.add (button)
+            clist.append([drive])
+
+        clist.connect ("select_row", self.row_selected)
+        box.add (clist)
+
+        box2 = GtkHButtonBox ()
+        box2.set_layout (BUTTONBOX_SPREAD)
+        button = GtkButton ("Run fdasd")
+        button.connect ("clicked", self.fdasd_button_clicked)
+        box2.add(button)
+        button = GtkButton ("Run dasdfmt")
+        button.connect ("clicked", self.dasdfmt_button_clicked)
+        box2.add(button)
 
         self.buttonBox.pack_start (label, FALSE)
         self.buttonBox.pack_start (box, FALSE)
+        self.buttonBox.pack_start (box2, FALSE)
         self.windowContainer.pack_start (self.buttonBox)
 
         self.ics.setNextEnabled (1)