Author: mzugec Date: Tue Feb 2 16:29:11 2010 New Revision: 60662 URL: http://svn.opensuse.org/viewcvs/yast?rev=60662&view=rev Log: DASD: support for additional dasd_configure ret codes (bnc#561876) Modified: trunk/s390/VERSION trunk/s390/package/yast2-s390.changes trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/VERSION?rev=60662&r1=60661&r2=60662&view=diff ============================================================================== --- trunk/s390/VERSION (original) +++ trunk/s390/VERSION Tue Feb 2 16:29:11 2010 @@ -1 +1 @@ -2.19.2 +2.19.3 Modified: trunk/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?rev=60662&r1=60661&r2=60662&view=diff ============================================================================== --- trunk/s390/package/yast2-s390.changes (original) +++ trunk/s390/package/yast2-s390.changes Tue Feb 2 16:29:11 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 2 16:28:53 CET 2010 - mzugec@suse.cz + +- DASD: support for additional dasd_configure ret codes (bnc#561876) +- 2.19.3 + +------------------------------------------------------------------- Wed Jan 13 18:56:03 CET 2010 - kmachalkova@suse.cz - Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.ycp?rev=60662&r1=60661&r2=60662&view=diff ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Tue Feb 2 16:29:11 2010 @@ -36,6 +36,7 @@ global define void ActivateDisk (string channel, boolean diag); +global define void DeactivateDisk (string channel, boolean diag); global define void ProbeDisks (); global define void FormatDisks (list<string> disks_list, integer par, boolean write_vl, boolean interactive); @@ -406,6 +407,16 @@ Report::Error (sformat ( // error report, %1 is device identification _("%1: Could not load module"), id)); + else if (ret == 7) + //bugzilla.novell.com/show_bug.cgi?id=561876#c8 + Report::Error (sformat ( + // error report, %1 is device identification + _("%1: Failed to activate DASD"), id)); + else if (ret == 8) + //bugzilla.novell.com/show_bug.cgi?id=561876#c8 + Report::Error (sformat ( + // error report, %1 is device identification + _("%1: DASD is not formatted"), id)); else Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code @@ -440,7 +451,12 @@ Popup::Error(sformat("Couldn't find device for %1 channel", channel)); } } - } else { + } else if (ret == 7){ + // when return code is 7, set DASD offline + // https://bugzilla.novell.com/show_bug.cgi?id=561876#c9 + DeactivateDisk(channel, diag); + } + else { ReportActivationError (channel, ret); } disk_configured = true; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org