Author: jsuchome Date: Thu Jul 30 15:46:08 2009 New Revision: 58220 URL: http://svn.opensuse.org/viewcvs/yast?rev=58220&view=rev Log: - adapted to changes in yast2-country: no saving of xorg.conf (bnc#441404) - 2.18.7 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_language_keyboard.ycp trunk/firstboot/src/firstboot_write.ycp trunk/firstboot/yast2-firstboot.spec.in Modified: trunk/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/VERSION?rev=58220&r1=58... ============================================================================== --- trunk/firstboot/VERSION (original) +++ trunk/firstboot/VERSION Thu Jul 30 15:46:08 2009 @@ -1 +1 @@ -2.18.6 +2.18.7 Modified: trunk/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboot... ============================================================================== --- trunk/firstboot/package/yast2-firstboot.changes (original) +++ trunk/firstboot/package/yast2-firstboot.changes Thu Jul 30 15:46:08 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jul 30 15:25:00 CEST 2009 - jsuchome@suse.cz + +- adapted to changes in yast2-country: no saving of xorg.conf + (bnc#441404) +- 2.18.7 + +------------------------------------------------------------------- Thu Jul 16 15:57:01 CEST 2009 - jsuchome@suse.cz - added example for root_password_as_first_user (fate#306297) into Modified: trunk/firstboot/src/firstboot_keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_keyboard.... ============================================================================== --- trunk/firstboot/src/firstboot_keyboard.ycp (original) +++ trunk/firstboot/src/firstboot_keyboard.ycp Thu Jul 30 15:46:08 2009 @@ -25,11 +25,9 @@ if (ret == `next) { - Keyboard::Save (false); + Keyboard::Save (); // 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.... ============================================================================== --- trunk/firstboot/src/firstboot_language.ycp (original) +++ trunk/firstboot/src/firstboot_language.ycp Thu Jul 30 15:46:08 2009 @@ -104,9 +104,6 @@ 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_language_keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_language_... ============================================================================== --- trunk/firstboot/src/firstboot_language_keyboard.ycp (original) +++ trunk/firstboot/src/firstboot_language_keyboard.ycp Thu Jul 30 15:46:08 2009 @@ -200,7 +200,7 @@ } Language::Save (); - Keyboard::Save (true); + Keyboard::Save (); Timezone::Save (); Console::Save (); } @@ -242,8 +242,6 @@ // 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)); if (ret == `next) break; } Modified: trunk/firstboot/src/firstboot_write.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_write.ycp... ============================================================================== --- trunk/firstboot/src/firstboot_write.ycp (original) +++ trunk/firstboot/src/firstboot_write.ycp Thu Jul 30 15:46:08 2009 @@ -76,15 +76,6 @@ 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 (); Modified: trunk/firstboot/yast2-firstboot.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/yast2-firstboot.spec.in... ============================================================================== --- trunk/firstboot/yast2-firstboot.spec.in (original) +++ trunk/firstboot/yast2-firstboot.spec.in Thu Jul 30 15:46:08 2009 @@ -13,8 +13,8 @@ # yast2/NeworkDevices -> yast2/NetworkInterfaces Requires: yast2 >= 2.16.23 Requires: yast2-bootloader -# Language::PackagesCommit -Requires: yast2-country >= 2.18.11 +# Keyboard::Write (), bnc#441404 +Requires: yast2-country >= 2.18.14 # Installation startup scripts Requires: yast2-installation -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org