Author: mzugec Date: Mon Nov 30 09:25:24 2009 New Revision: 59845 URL: http://svn.opensuse.org/viewcvs/yast?rev=59845&view=rev Log: dasd: activation non-formated devices (bnc#446998) 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=59845&r1=59844&r2=59845&view=diff ============================================================================== --- trunk/s390/VERSION (original) +++ trunk/s390/VERSION Mon Nov 30 09:25:24 2009 @@ -1 +1 @@ -2.18.8 +2.19.0 Modified: trunk/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?rev=59845&r1=59844&r2=59845&view=diff ============================================================================== --- trunk/s390/package/yast2-s390.changes (original) +++ trunk/s390/package/yast2-s390.changes Mon Nov 30 09:25:24 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 30 09:25:00 CET 2009 - mzugec@suse.cz + +- dasd: activation non-formated devices (bnc#446998) +- 2.19.0 + +------------------------------------------------------------------- Thu Nov 12 17:48:55 CET 2009 - mzugec@suse.cz - zfcp: fixed devices list filter (bnc#538313) Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.ycp?rev=59845&r1=59844&r2=59845&view=diff ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Mon Nov 30 09:25:24 2009 @@ -22,6 +22,7 @@ import "Summary"; import "Arch"; import "FileUtils"; +import "Popup"; global map<integer,map<string,any> > devices = $[]; @@ -427,7 +428,21 @@ ); y2milestone ("Running command %1", command); integer ret = (integer)SCR::Execute (.target.bash, command); - ReportActivationError (channel, ret); + if (ret == 5){ + if (Popup::ContinueCancel(_("Device is not DASD. Format device?"))){ + string cmd = sformat("ls /sys/bus/ccw/devices/%1/block/|tr -d '\n'", channel); + map<string, any> disk = (map<string, any>)SCR::Execute(.target.bash_output, cmd); + if (disk["exit"]:-1 == 0 && size(disk["stdout"]:"")>0){ + FormatDisks ([ disk["stdout"]:"" ], 1, true, true); +// ReloadDASDDialog (); + ActivateDisk(channel, diag); + } else { + Popup::Error(sformat("Couldn't find device for %1 channel", channel)); + } + } + } 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