Author: jsrain Date: Fri Nov 5 07:56:22 2010 New Revision: 62753 URL: http://svn.opensuse.org/viewcvs/yast?rev=62753&view=rev Log: fixes for unattended migration Modified: branches/tmp/jsrain/unattended-migration/iscsi-client/src/IscsiClient.ycp branches/tmp/jsrain/unattended-migration/iscsi-client/src/iscsi-client_auto.ycp Modified: branches/tmp/jsrain/unattended-migration/iscsi-client/src/IscsiClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migration/iscsi-client/src/IscsiClient.ycp?rev=62753&r1=62752&r2=62753&view=diff ============================================================================== --- branches/tmp/jsrain/unattended-migration/iscsi-client/src/IscsiClient.ycp (original) +++ branches/tmp/jsrain/unattended-migration/iscsi-client/src/IscsiClient.ycp Fri Nov 5 07:56:22 2010 @@ -230,12 +230,12 @@ /* Progress stage 2/2 */ _("Set up service status") ]; - if (!Mode::autoinst()) descr=remove(descr, 0); + if (!(Mode::autoinst() || Mode::autoupgrade())) descr=remove(descr, 0); // TODO FIXME Names of real stages // We do not set help text here, because it was set outside Progress::New(caption, " ", size(descr), descr, [], ""); - if (Mode::autoinst()){ + if (Mode::autoinst() || Mode::autoupgrade()){ if(Abort()) return false; Progress::NextStage(); IscsiClientLib::autoyastPrepare(); Modified: branches/tmp/jsrain/unattended-migration/iscsi-client/src/iscsi-client_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migration/iscsi-client/src/iscsi-client_auto.ycp?rev=62753&r1=62752&r2=62753&view=diff ============================================================================== --- branches/tmp/jsrain/unattended-migration/iscsi-client/src/iscsi-client_auto.ycp (original) +++ branches/tmp/jsrain/unattended-migration/iscsi-client/src/iscsi-client_auto.ycp Fri Nov 5 07:56:22 2010 @@ -88,6 +88,7 @@ boolean progress_orig = Progress::set (false); IscsiClient::write_only = true; ModuleLoading::Load("iscsi_tcp", "", "", "", false, true); + IscsiClientLib::autoyastPrepare(); SCR::Execute(.background.run_output_err, "iscsid"); ret = IscsiClient::Write(); Progress::set (progress_orig); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org