Author: aschnell Date: Fri Feb 17 16:13:42 2012 New Revision: 67474 URL: http://svn.opensuse.org/viewcvs/yast?rev=67474&view=rev Log: - addad progress popup - cleanup Modified: trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.ycp?rev=67474&r1=67473&r2=67474&view=diff ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Fri Feb 17 16:13:42 2012 @@ -180,7 +180,7 @@ string command = "/sbin/mkinitrd && /sbin/zipl"; y2milestone("Running command %1", command); any ret = SCR::Execute(.target.bash, command); - y2milestone ("Exit code: %1", ret); + y2milestone("Exit code: %1", ret); UI::CloseDialog(); } @@ -309,12 +309,11 @@ global list<string> Summary() { list<string> ret = maplist (integer index, map d, devices, { - // summary text, %1 is channel ID (number), - // %2 and %3 are Yes or No + // summary text, %1 is channel (number), // %2 and %3 are Yes or No return sformat(_("Channel: %1, Format: %2, DIAG: %3"), d["channel"]:"", String::YesNo(d["format"]:false), String::YesNo(d["diag"]:false)); }); - y2milestone ("Summary: %1", ret); + y2milestone("Summary: %1", ret); return ret; } @@ -407,10 +406,10 @@ /** * Report error occured during device activation - * @param id integer chanel id of the device + * @param channel string channel of the device * @param ret integer exit code of the operation */ -void ReportActivationError(any id, integer ret) +void ReportActivationError(string channel, integer ret) { switch (ret) { @@ -420,59 +419,59 @@ case 1: Report::Error (sformat ( // error report, %1 is device identification - _("%1: sysfs not mounted."), id)); + _("%1: sysfs not mounted."), channel)); break; case 2: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Invalid status for <online>."), id)); + _("%1: Invalid status for <online>."), channel)); break; case 3: Report::Error (sformat ( // error report, %1 is device identification - _("%1: No device found for <ccwid>."), id)); + _("%1: No device found for <ccwid>."), channel)); break; case 4: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Could not change state of the device."), id)); + _("%1: Could not change state of the device."), channel)); break; case 5: // https://bugzilla.novell.com/show_bug.cgi?id=446998#c15 Report::Error (sformat ( // error report, %1 is device identification - _("%1: Device is not a DASD."), id)); + _("%1: Device is not a DASD."), channel)); break; case 6: // https://bugzilla.novell.com/show_bug.cgi?id=446998#c15 Report::Error (sformat ( // error report, %1 is device identification - _("%1: Could not load module."), id)); + _("%1: Could not load module."), channel)); break; case 7: // http://bugzilla.novell.com/show_bug.cgi?id=561876#c8 Report::Error (sformat ( // error report, %1 is device identification - _("%1: Failed to activate DASD."), id)); + _("%1: Failed to activate DASD."), channel)); break; case 8: // http://bugzilla.novell.com/show_bug.cgi?id=561876#c8 Report::Error (sformat ( // error report, %1 is device identification - _("%1: DASD is not formatted."), id)); + _("%1: DASD is not formatted."), channel)); break; default: Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code - _("%1: Unknown error %2."), id, ret)); + _("%1: Unknown error %2."), channel, ret)); break; } } Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.ycp?rev=67474&r1=67473&r2=67474&view=diff ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Fri Feb 17 16:13:42 2012 @@ -132,15 +132,17 @@ global boolean Write() { if (disk_configured && Mode::normal ()) { + // popup label + UI::OpenDialog(`Label(_("Running mkinitrd and zipl."))); + string command = "/sbin/mkinitrd && /sbin/zipl"; y2milestone ("Running command %1", command); - any ret = SCR::Execute (.target.bash, command); - y2milestone ("Exit code: %1", ret); - } - else - { - y2milestone ("No new disk configured"); + any ret = SCR::Execute(.target.bash, command); + y2milestone("Exit code: %1", ret); + + UI::CloseDialog(); } + return true; } @@ -248,26 +250,25 @@ global list<string> Summary() { list<string> ret = maplist (integer index, map d, devices, { - // summary text, %1 is channel ID, %1 is WWPN, %3 is LUN + // summary text, %1 is channel, %1 is WWPN, %3 is LUN // (all of them are numbers) - string s = sformat (_("Channel ID: %1, WWPN: %2, ZFCP LUN: %3"), - d["detail","controller_id"]:"", - d["detail","wwpn"]:"", - d["detail","fcp_lun"]:"" - ); - return s; + return sformat(_("Channel: %1, WWPN: %2, ZFCP LUN: %3"), + d["detail", "controller_id"]:"", d["detail", "wwpn"]:"", + d["detail", "fcp_lun"]:""); }); - y2milestone ("Summary: %1", ret); + y2milestone("Summary: %1", ret); return ret; } + /** * Return packages needed to be installed and removed during * Autoinstallation to insure module has all needed software * installed. * @return map with 2 lists. */ -global map AutoPackages() { +global map AutoPackages() +{ return $[ "install":[], "remove":[] ]; } @@ -331,10 +332,10 @@ /** * Report error occured during device activation - * @param id integer chanel id of the device + * @param channel string channel of the device * @param ret integer exit code of the operation */ -void ReportActivationError(any id, integer ret) +void ReportActivationError(string channel, integer ret) { switch (ret) { @@ -344,61 +345,61 @@ case 1: Report::Error (sformat ( // error report, %1 is device identification - _("%1: sysfs not mounted."), id)); + _("%1: sysfs not mounted."), channel)); break; case 2: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Invalid status for <online>."), id)); + _("%1: Invalid status for <online>."), channel)); break; case 3: Report::Error (sformat ( // error report, %1 is device identification - _("%1: No device found for <ccwid>."), id)); + _("%1: No device found for <ccwid>."), channel)); break; case 4: Report::Error (sformat ( // error report, %1 is device identification - _("%1: WWPN invalid."), id)); + _("%1: WWPN invalid."), channel)); break; case 5: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Could not activate WWPN for adapter %1."), id)); + _("%1: Could not activate WWPN for adapter %1."), channel)); break; case 6: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Could not activate ZFCP device."), id)); + _("%1: Could not activate ZFCP device."), channel)); break; case 7: Report::Error (sformat ( // error report, %1 is device identification - _("%1: SCSI disk could not be deactivated."), id)); + _("%1: SCSI disk could not be deactivated."), channel)); break; case 8: Report::Error (sformat ( // error report, %1 is device identification - _("%1: ZFCP LUN could not be unregistered."), id)); + _("%1: ZFCP LUN could not be unregistered."), channel)); break; case 9: Report::Error (sformat ( // error report, %1 is device identification - _("%1: ZFCP WWPN could not be unregistered."), id)); + _("%1: ZFCP WWPN could not be unregistered."), channel)); break; default: Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code - _("%1: Unknown error %2."), id, ret)); + _("%1: Unknown error %2."), channel, ret)); break; } } @@ -406,10 +407,10 @@ /** * Report error occured during device activation - * @param id integer chanel id of the device + * @param channel string channel of the device * @param ret integer exit code of the operation */ -void ReportControllerActivationError(any id, integer ret) +void ReportControllerActivationError(string channel, integer ret) { switch (ret) { @@ -419,43 +420,43 @@ case 1: Report::Error (sformat ( // error report, %1 is device identification - _("%1: sysfs not mounted."), id)); + _("%1: sysfs not mounted."), channel)); break; case 2: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Invalid status for <online>."), id)); + _("%1: Invalid status for <online>."), channel)); break; case 3: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Device <ccwid> does not exist."), id)); + _("%1: Device <ccwid> does not exist."), channel)); break; case 4: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Module zfcp could not be loaded."), id)); + _("%1: Module zfcp could not be loaded."), channel)); break; case 5: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Adapter status could not be changed."), id)); + _("%1: Adapter status could not be changed."), channel)); break; case 6: Report::Error (sformat ( // error report, %1 is device identification - _("%1: WWPN ports still active."), id)); + _("%1: WWPN ports still active."), channel)); break; default: Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code - _("%1: Unknown error %2."), id, ret)); + _("%1: Unknown error %2."), channel, ret)); break; } } @@ -463,7 +464,7 @@ /** * Activate a disk - * @param channel string channel id + * @param channel string channel * @param wwpn string wwpn (hexa number) * @param lun string lun (hexa number) */ @@ -499,8 +500,8 @@ /** - * Activate a disk - * @param channel string channel id + * Deactivate a disk + * @param channel string channel * @param wwpn string wwpn (hexa number) * @param lun string lun (hexa number) */ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org