Author: mzugec Date: Mon Dec 21 16:31:49 2009 New Revision: 60163 URL: http://svn.opensuse.org/viewcvs/yast?rev=60163&view=rev Log: dasd: applied tested patch (bnc#446998) Modified: branches/SuSE-Code-11-SP1-Branch/s390/VERSION branches/SuSE-Code-11-SP1-Branch/s390/src/modules/DASDController.ycp Modified: branches/SuSE-Code-11-SP1-Branch/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/s390/VERSION?rev=60163&r1=60162&r2=60163&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/s390/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/s390/VERSION Mon Dec 21 16:31:49 2009 @@ -1 +1 @@ -2.17.12 +2.17.13 Modified: branches/SuSE-Code-11-SP1-Branch/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/s390/src/modules/DASDController.ycp?rev=60163&r1=60162&r2=60163&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/s390/src/modules/DASDController.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/s390/src/modules/DASDController.ycp Mon Dec 21 16:31:49 2009 @@ -429,11 +429,11 @@ 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 not DASD. Format device?"))){ + if (Popup::ContinueCancel(_("Device is unformatted. 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); + FormatDisks ([ sformat("/dev/%1", disk["stdout"]:"") ], 1, true, true); // ReloadDASDDialog (); ActivateDisk(channel, diag); } else { @@ -491,7 +491,7 @@ if (! write_vl) additional_param = "--no-label"; string command = sformat ( - "/sbin/dasdfmt -Y -P %2 -b 4096 -y -m 1 %3 %1", disks_param, par, + "/sbin/dasdfmt -P %2 -b 4096 -y -m 1 %3 %1", disks_param, par, additional_param); y2milestone ("Running command %1", command); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org