Author: jsuchome Date: Thu Aug 9 16:25:22 2007 New Revision: 40134 URL: http://svn.opensuse.org/viewcvs/yast?rev=40134&view=rev Log: - during live installation config, do not automatically adapt keyboard layout to the language (#298792) - 2.15.17 Modified: trunk/country/VERSION trunk/country/keyboard/src/modules/Keyboard.ycp trunk/country/package/yast2-country.changes Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=40134&r1=40133&r2=40134&view=diff ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Thu Aug 9 16:25:22 2007 @@ -1 +1 @@ -2.15.16 +2.15.17 Modified: trunk/country/keyboard/src/modules/Keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/keyboard/src/modules/Keyboard.ycp?rev=40134&r1=40133&r2=40134&view=diff ============================================================================== --- trunk/country/keyboard/src/modules/Keyboard.ycp (original) +++ trunk/country/keyboard/src/modules/Keyboard.ycp Thu Aug 9 16:25:22 2007 @@ -617,7 +617,7 @@ restore_called = true; GetKbdSysconfig(); - if (!Stage::initial ()) + if (!Stage::initial () || Mode::live_installation ()) { // Read YaST2 keyboard var. // @@ -849,7 +849,7 @@ // If not in initial mode try to restore from sysconfig. // - if (!Stage::initial ()) + if (!Stage::initial () || Mode::live_installation ()) { success = Restore(); @@ -880,8 +880,7 @@ } // In initial mode or if restoring failed do probe. - // - if( Stage::initial () || !success ) // initial mode or no restore success + if(!success || (Stage::initial () && !Mode::live_installation ())) { // On module entry probe the hardware and set all those data // needed for public access. @@ -1154,7 +1153,7 @@ // Actually do it only if we are in graphical mode. // boolean textmode = Linuxrc::text (); - if (!Stage::initial ()) + if (!Stage::initial () || Mode::live_installation ()) { map display_info = UI::GetDisplayInfo (); textmode = display_info["TextMode"]:false; @@ -1200,7 +1199,7 @@ SetConsole (keyboard); SetX11 (keyboard); - if (Stage::initial ()) + if (Stage::initial () && !Mode::live_installation ()) { map yinf = $[]; AsciiFile::SetDelimiter( yinf, " " ); @@ -1252,7 +1251,7 @@ // set from outside the module. if (user_decision || (Mode::update () && !Stage::initial ()) || - Mode::autoinst () || + Mode::autoinst () || Mode::live_installation () || ProductFeatures::GetStringFeature ("globals", "keyboard") != "") { if (language_changed) Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.changes?rev=40134&r1=40133&r2=40134&view=diff ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Thu Aug 9 16:25:22 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Aug 9 15:20:35 CEST 2007 - jsuchome@suse.cz + +- during live installation config, do not automatically adapt + keyboard layout to the language (#298792) +- 2.15.17 + +------------------------------------------------------------------- Fri Aug 3 13:21:03 CEST 2007 - jsuchome@suse.cz - disable DPMS while adapting time (#294292) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org