Author: jsuchome Date: Mon Jun 1 13:12:02 2009 New Revision: 57383 URL: http://svn.opensuse.org/viewcvs/yast?rev=57383&view=rev Log: - call the X11 config to save kbd layout (bnc#497819) - 2.18.2 Modified: trunk/firstboot/VERSION trunk/firstboot/package/yast2-firstboot.changes trunk/firstboot/src/firstboot_keyboard.ycp trunk/firstboot/src/firstboot_language.ycp trunk/firstboot/src/firstboot_write.ycp Modified: trunk/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/VERSION?rev=57383&r1=57382&r2=57383&view=diff ============================================================================== --- trunk/firstboot/VERSION (original) +++ trunk/firstboot/VERSION Mon Jun 1 13:12:02 2009 @@ -1 +1 @@ -2.18.1 +2.18.2 Modified: trunk/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboot.changes?rev=57383&r1=57382&r2=57383&view=diff ============================================================================== --- trunk/firstboot/package/yast2-firstboot.changes (original) +++ trunk/firstboot/package/yast2-firstboot.changes Mon Jun 1 13:12:02 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jun 1 13:10:05 CEST 2009 - jsuchome@suse.cz + +- call the X11 config to save kbd layout (bnc#497819) +- 2.18.2 + +------------------------------------------------------------------- Tue Apr 14 14:44:19 CEST 2009 - jsuchome@suse.cz - grab texts from firstboot.xml when creating pot file (bnc#479571) Modified: trunk/firstboot/src/firstboot_keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_keyboard.ycp?rev=57383&r1=57382&r2=57383&view=diff ============================================================================== --- trunk/firstboot/src/firstboot_keyboard.ycp (original) +++ trunk/firstboot/src/firstboot_keyboard.ycp Mon Jun 1 13:12:02 2009 @@ -28,6 +28,8 @@ Keyboard::Save (false); // kbd must be restarted after YaST finishes (#303808) SCR::Execute (.target.bash, sformat ("touch %1/firstboot_kbd_restart", Directory::vardir)); + // save X11 keyboard layout at the end + SCR::Execute (.target.bash, sformat ("touch %1/firstboot_x11_save", Directory::vardir)); } return ret; Modified: trunk/firstboot/src/firstboot_language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_language.ycp?rev=57383&r1=57382&r2=57383&view=diff ============================================================================== --- trunk/firstboot/src/firstboot_language.ycp (original) +++ trunk/firstboot/src/firstboot_language.ycp Mon Jun 1 13:12:02 2009 @@ -19,6 +19,7 @@ textdomain "firstboot"; import "Console"; + import "Directory"; import "Language"; import "Wizard"; import "Firstboot"; @@ -34,7 +35,6 @@ string language_on_entry = Language::language; y2milestone("language_on_entry: <%1>", language_on_entry ); - any result = `again; // create the wizard dialog while (result == `again) @@ -97,12 +97,17 @@ } }); if (!firstboot_keyboard) + { // popup text Popup::Message( _("Your language setting has been changed. If necessary, you may want to adapt your keyboard settings to the new language. This is possible either in the YaST2 Control Center or by starting \"yast2 keyboard\" directly.")); + // save X11 keyboard layout at the end: + // (default change of layout was done based on language) + SCR::Execute (.target.bash, sformat ("touch %1/firstboot_x11_save", Directory::vardir)); + } } else { Modified: trunk/firstboot/src/firstboot_write.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_write.ycp?rev=57383&r1=57382&r2=57383&view=diff ============================================================================== --- trunk/firstboot/src/firstboot_write.ycp (original) +++ trunk/firstboot/src/firstboot_write.ycp Mon Jun 1 13:12:02 2009 @@ -8,9 +8,12 @@ */ { textdomain "firstboot"; - import "Progress"; - import "Popup"; + import "Directory"; + import "FileUtils"; import "Firstboot"; + import "Keyboard"; + import "Popup"; + import "Progress"; import "Wizard"; @@ -73,6 +76,15 @@ sleep(100); Progress::NextStage (); + // call the X11 config before executing the scripts... (bnc#497819,c23) + string file = sformat ("%1/firstboot_x11_save", Directory::vardir); + if (FileUtils::Exists (file)) + { + // current X11 keyboard layout needs to be saved + Keyboard::xf86_update (); + SCR::Execute (.target.remove, file); + } + Firstboot::ExecuteScripts(); sleep(100); Progress::Finish (); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org