Author: locilka Date: Mon May 5 14:33:00 2008 New Revision: 47268 URL: http://svn.opensuse.org/viewcvs/yast?rev=47268&view=rev Log: - Propose runlevel 5 for live installation. - 2.16.5 Modified: trunk/runlevel/VERSION trunk/runlevel/package/yast2-runlevel.changes trunk/runlevel/src/runlevel_proposal.ycp Modified: trunk/runlevel/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/VERSION?rev=47268&r1=47267&r2=47268&view=diff ============================================================================== --- trunk/runlevel/VERSION (original) +++ trunk/runlevel/VERSION Mon May 5 14:33:00 2008 @@ -1 +1 @@ -2.16.4 +2.16.5 Modified: trunk/runlevel/package/yast2-runlevel.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/package/yast2-runlevel.changes?rev=47268&r1=47267&r2=47268&view=diff ============================================================================== --- trunk/runlevel/package/yast2-runlevel.changes (original) +++ trunk/runlevel/package/yast2-runlevel.changes Mon May 5 14:33:00 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 5 14:29:19 CEST 2008 - locilka@suse.cz + +- Propose runlevel 5 for live installation. +- 2.16.5 + +------------------------------------------------------------------- Mon Apr 28 12:21:50 CEST 2008 - jsrain@suse.cz - store runlevel during live installation (bnc #381426) Modified: trunk/runlevel/src/runlevel_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/src/runlevel_proposal.ycp?rev=47268&r1=47267&r2=47268&view=diff ============================================================================== --- trunk/runlevel/src/runlevel_proposal.ycp (original) +++ trunk/runlevel/src/runlevel_proposal.ycp Mon May 5 14:33:00 2008 @@ -192,6 +192,7 @@ // some architectures don't have X at all boolean x11_needed = Arch::x11_setup_needed (); // constant boolean x11_selected = Pkg::IsSelected ("xorg-x11"); // variable + boolean live_medium = Mode::live_installation(); // But if we install over VNC, we want RL 5 (and kdm) even though // there's no X. @@ -200,8 +201,9 @@ // we can be overriden string forced_runlevel = (string)ProductFeatures::GetFeature("globals", "runlevel"); - y2milestone ("x11_setup_needed: %1, x11_selected: %2, vnc: %3, ssh %4, forced: '%5'", - x11_needed, x11_selected, vnc, ssh, forced_runlevel); + + y2milestone ("x11_setup_needed: %1, x11_selected: %2, vnc: %3, ssh %4, forced: '%5', live_medium: %6", + x11_needed, x11_selected, vnc, ssh, forced_runlevel, live_medium); // check only what the user can change at this time // Initially the module variables are nil so the condition triggers @@ -212,7 +214,8 @@ // do the proposal if (! Mode::autoinst()) { // the default runlevel selection - RunlevelEd::default_runlevel = (x11_needed && x11_selected) ? "5":"3"; + // see also bnc #381426 for live-medium + RunlevelEd::default_runlevel = ((x11_needed && x11_selected) || live_medium) ? "5":"3"; // Both VNC and SSH installation, let's assume that user wants // to continue later using the same runlevel as it uses now -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org