Author: locilka Date: Mon Oct 15 16:01:48 2007 New Revision: 41430 URL: http://svn.opensuse.org/viewcvs/yast?rev=41430&view=rev Log: - Abort the installation instead of halting the system in case of declining the license when installing from LiveCD (#330730). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_license.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=41430&r1=41429&r2=41430&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Oct 15 16:01:48 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Oct 15 16:00:06 CEST 2007 - locilka@suse.cz + +- Abort the installation instead of halting the system in case of + declining the license when installing from LiveCD (#330730). + +------------------------------------------------------------------- Thu Oct 11 15:00:03 CEST 2007 - jsrain@suse.cz - show release notes properly in live installation (#332862) Modified: trunk/installation/src/clients/inst_license.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_license.ycp?rev=41430&r1=41429&r2=41430&view=diff ============================================================================== --- trunk/installation/src/clients/inst_license.ycp (original) +++ trunk/installation/src/clients/inst_license.ycp Mon Oct 15 16:01:48 2007 @@ -16,6 +16,7 @@ import "GetInstArgs"; import "Stage"; import "ProductLicense"; +import "Mode"; map display = UI::GetDisplayInfo(); integer space = display["TextMode"]:true ? 1 : 3; @@ -30,6 +31,13 @@ // bugzilla #252132 string action = argmap["action"]:"halt"; +// Do not halt the machine in case of declining the license +// just abort +// bugzilla #330730 +if (Mode::live_installation()) { + action = "abort"; +} + symbol ask_ret = nil; string text = ""; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org