Author: aschnell
Date: Fri May 13 09:58:22 2011
New Revision: 63984
URL: http://svn.opensuse.org/viewcvs/yast?rev=63984&view=rev
Log:
- allow to configure zFCP tapes (fate #311718)
Modified:
trunk/s390/VERSION
trunk/s390/package/yast2-s390.changes
trunk/s390/src/clients/zfcp_proposal.ycp
trunk/s390/src/modules/ZFCPController.ycp
trunk/s390/src/zfcp/dialogs.ycp
trunk/s390/src/zfcp/helps.ycp
Modified: trunk/s390/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/VERSION?rev=63984&r1=63983&r2=63984&view=diff
==============================================================================
--- trunk/s390/VERSION (original)
+++ trunk/s390/VERSION Fri May 13 09:58:22 2011
@@ -1 +1 @@
-2.21.0
+2.21.1
Modified: trunk/s390/package/yast2-s390.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?rev=63984&r1=63983&r2=63984&view=diff
==============================================================================
--- trunk/s390/package/yast2-s390.changes (original)
+++ trunk/s390/package/yast2-s390.changes Fri May 13 09:58:22 2011
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri May 13 03:36:54 EDT 2011 - aschnell@suse.de
+
+- allow to configure zFCP tapes (fate #311718)
+- 2.21.1
+
+-------------------------------------------------------------------
Thu May 05 11:10:41 CEST 2011 - aschnell@suse.de
- set exclusive architecture to s390 and s390x (bnc #690511)
Modified: trunk/s390/src/clients/zfcp_proposal.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/zfcp_proposal.ycp?rev=63984&r1=63983&r2=63984&view=diff
==============================================================================
--- trunk/s390/src/clients/zfcp_proposal.ycp (original)
+++ trunk/s390/src/clients/zfcp_proposal.ycp Fri May 13 09:58:22 2011
@@ -24,7 +24,7 @@
list summary = ZFCPController::Summary();
if (size (summary) == 0)
// text for installation summary
- summary = [ _("No zFCP disk configured") ];
+ summary = [ _("No zFCP device configured") ];
// Fill return map
ret =
$[ "raw_proposal" : summary,
Modified: trunk/s390/src/modules/ZFCPController.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.ycp?rev=63984&r1=63983&r2=63984&view=diff
==============================================================================
--- trunk/s390/src/modules/ZFCPController.ycp (original)
+++ trunk/s390/src/modules/ZFCPController.ycp Fri May 13 09:58:22 2011
@@ -230,21 +230,6 @@
return $[ "install":[], "remove":[] ];
}
-/**
- * Check if ZFCP subsystem is available
- * @return boolean whether the ZFCP-System is availble at all
- */
-global define boolean IsAvailable () {
- if (controllers == nil)
- {
- controllers = (list >)SCR::Read (.probe.storage);
- controllers = filter (map c, controllers, {
- return c["device"]:"" == "zFCP controller";
- });
- y2milestone ("Found %1 zfcp controllers", size (controllers));
- }
- return size (controllers) > 0;
-}
/**
* Get available zfcp controllers
@@ -262,28 +247,43 @@
return controllers;
}
+
+/**
+ * Check if ZFCP subsystem is available
+ * @return boolean whether the ZFCP-System is availble at all
+ */
+global boolean IsAvailable()
+{
+ return size(GetControllers()) > 0;
+}
+
+
/**
* Get available disks
*/
-global define void ProbeDisks () {
+global void ProbeDisks()
+{
/* if (Mode::config ())
return;*/
// popup label
- UI::OpenDialog (`Label (_("Reading Configured ZFCP Disks")));
+ UI::OpenDialog(`Label(_("Reading Configured ZFCP Devices")));
- list > disks = (list >)
- SCR::Read (.probe.disk);
+ list > disks = (list >) SCR::Read(.probe.disk);
+ disks = filter(map d, disks, { return d["bus"]:"" == "SCSI"; });
+
+ list > tapes = (list >) SCR::Read(.probe.tape);
+ tapes = filter(map d, tapes, { return d["bus"]:"" == "SCSI"; });
+
+ list > disks_tapes = (list >) merge(disks, tapes);
- disks = filter (map d, disks, ``(
- d["bus"]:"" == "SCSI"
- ));
integer index = -1;
- ZFCPController::devices = listmap (map d, disks, ``{
+ devices = listmap (map d, disks_tapes, {
index = index + 1;
return $[ index : d ];
});
- UI::CloseDialog ();
+
+ UI::CloseDialog();
}
/**
@@ -317,7 +317,7 @@
else if (ret == 6)
Report::Error (sformat (
// error report, %1 is device identification
- _("%1: Could not activate ZFCP disk."), id));
+ _("%1: Could not activate ZFCP device."), id));
else if (ret == 7)
Report::Error (sformat (
// error report, %1 is device identification
Modified: trunk/s390/src/zfcp/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=63984&r1=63983&r2=63984&view=diff
==============================================================================
--- trunk/s390/src/zfcp/dialogs.ycp (original)
+++ trunk/s390/src/zfcp/dialogs.ycp Fri May 13 09:58:22 2011
@@ -129,7 +129,7 @@
string help = ZFCP_HELPS["disk_selection"]:"";
/* Dialog caption */
- string caption = _("Configured ZFCP Disks");
+ string caption = _("Configured ZFCP Devices");
/* Dialog content */
term content = `VBox(
@@ -198,7 +198,7 @@
else if (ret == `abort || ret == `cancel)
{
// yes-no popup
- if (! Popup::YesNo (_("Really leave the ZFCP disk configuration without saving?
+ if (! Popup::YesNo (_("Really leave the ZFCP device configuration without saving?
All changes will be lost.")))
{
ret = nil;
@@ -213,7 +213,7 @@
string fcp_lun = descr["detail", "fcp_lun"]:"unknown";
// popup qestion, %1 is device name (eg. /dev/sda)
- if (! Popup::YesNo (sformat (_("Remove disk %1?"), dev_name)))
+ if (! Popup::YesNo (sformat (_("Remove device %1?"), dev_name)))
{
ret = nil;
continue;
@@ -252,7 +252,7 @@
string help = ZFCP_HELPS["disk_add"]:"";
/* Dialog caption */
- string caption = _("Add New ZFCP Disk");
+ string caption = _("Add New ZFCP Device");
string fcp_lun = ZFCPController::previous_settings["fcp_lun"]:"";
if (fcp_lun == nil || fcp_lun == "")
@@ -341,7 +341,7 @@
else if (ret == `abort || ret == `cancel)
{
// yes-no popup
- if (! Popup::YesNo (_("Really leave the ZFCP disk configuration without saving?
+ if (! Popup::YesNo (_("Really leave the ZFCP device configuration without saving?
All changes will be lost.")))
{
ret = nil;
Modified: trunk/s390/src/zfcp/helps.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/helps.ycp?rev=63984&r1=63983&r2=63984&view=diff
==============================================================================
--- trunk/s390/src/zfcp/helps.ycp (original)
+++ trunk/s390/src/zfcp/helps.ycp Fri May 13 09:58:22 2011
@@ -17,7 +17,7 @@
map ZFCP_HELPS = $[
/* Read dialog help 1/2 */
- "read" : _("<p><b><big>Initializing ZFCP Disk Configuration</big></b><br>
+ "read" : _("<p><b><big>Initializing ZFCP Device Configuration</big></b><br>
Please wait...<br></p>") +
/* Read dialog help 2/2 */
@@ -25,7 +25,7 @@
Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"),
/* Write dialog help 1/2 */
- "write" : _("<p><b><big>Saving ZFCP Disk Configuration</big></b><br>
+ "write" : _("<p><b><big>Saving ZFCP Device Configuration</big></b><br>
Please wait...<br></p>") +
/* Write dialog help 2/2 */
@@ -34,14 +34,14 @@
An additional dialog informs whether it is safe to do so.</p>"),
/* Disk selection dialog help 1/3 */
- "disk_selection" : _("<p><b><big>Configured ZFCP Disks</big></b><br>
-In this dialog, manage ZFCP disks on your system.</p>") +
+ "disk_selection" : _("<p><b><big>Configured ZFCP Devices</big></b><br>
+In this dialog, manage ZFCP devices on your system.</p>") +
/* Disk selection dialog help 2/3 */
-_("<p>To configure a new ZFCP disk, click <b>Add</b>.</p>") +
+_("<p>To configure a new ZFCP device, click <b>Add</b>.</p>") +
/* Disk selection dialog help 3/3 */
-_("<p>To remove a configured ZFCP disk, select it and click
+_("<p>To remove a configured ZFCP device, select it and click
<b>Delete</b>.</p>") +
/* Disk selection dialog Warning */
@@ -50,8 +50,8 @@
Otherwise there is a potential risk of data corruption.</p>"),
/* Disk add help 1/2 */
- "disk_add" : _("<p><b><big>Add New ZFCP Disk</big></b><br>
-Enter the identifier of the disk to add. Enter the
+ "disk_add" : _("<p><b><big>Add New ZFCP Device</big></b><br>
+Enter the identifier of the device to add. Enter the
<b>Channel Number</b> of the ZFCP controller, the worldwide port number
(<b>WWPN</b>), and the <b>FCP-LUN</b> number.</p>") +
/* Disk add help 2/2, This is HTML, so finally "<devno>" is displayed as "<devno>" */
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
