[yast-commit] r63413 - in /trunk/s390: package/yast2-s390.changes src/modules/DASDController.ycp
Author: jsrain
Date: Tue Feb 15 10:53:24 2011
New Revision: 63413
URL: http://svn.opensuse.org/viewcvs/yast?rev=63413&view=rev
Log:
added time-out when asking about formatting a disk during AutoInstallation (bnc#668317)
Modified:
trunk/s390/package/yast2-s390.changes
trunk/s390/src/modules/DASDController.ycp
Modified: trunk/s390/package/yast2-s390.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?rev=63413&r1=63412&r2=63413&view=diff
==============================================================================
--- trunk/s390/package/yast2-s390.changes (original)
+++ trunk/s390/package/yast2-s390.changes Tue Feb 15 10:53:24 2011
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Feb 15 10:48:06 CET 2011 - jsrain@suse.cz
+
+- added time-out when asking about formatting a disk during
+ AutoInstallation (bnc#668317)
+
+-------------------------------------------------------------------
Thu Oct 21 17:46:53 CEST 2010 - mzugec@suse.cz
- DASD: if possible, use device by-path in AY Export (bnc#591603)
Modified: trunk/s390/src/modules/DASDController.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.ycp?rev=63413&r1=63412&r2=63413&view=diff
==============================================================================
--- trunk/s390/src/modules/DASDController.ycp (original)
+++ trunk/s390/src/modules/DASDController.ycp Tue Feb 15 10:53:24 2011
@@ -442,7 +442,10 @@
integer ret = (integer)SCR::Execute (.target.bash, command);
y2milestone ("Running command %1 with exit code %2", command, ret);
if (ret == 5){
- if (Popup::ContinueCancel(_("Device is unformatted. Format device?"))){
+ string popup = sformat (_("Device %1 is unformatted. Format device now?\nIf you want to format multiple devices in parallel,\npress Cancel and select 'Perform Action', 'Format' later on!"), channel);
+ if ((Mode::autoinst() && Popup::TimedOKCancel(popup, 10))
+ || Popup::ContinueCancel (popup))
+ {
string cmd = sformat("ls /sys/bus/ccw/devices/%1/block/|tr -d '\n'", channel);
map
participants (1)
-
jsrain@svn2.opensuse.org