Author: jsrain Date: Wed Feb 27 11:42:34 2008 New Revision: 45066 URL: http://svn.opensuse.org/viewcvs/yast?rev=45066&view=rev Log: merged chanes from the SP1 branch which had been added for appliances Added: branches/SuSE-SLE-10-SP2-Branch/firstboot/src/firstboot_bootloader_reconfigure.ycp - copied unchanged from r45065, branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_bootloader_reconfigure.ycp branches/SuSE-SLE-10-SP2-Branch/firstboot/src/firstboot_keyboard.ycp - copied unchanged from r45065, branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_keyboard.ycp branches/SuSE-SLE-10-SP2-Branch/firstboot/src/firstboot_license_novell.ycp - copied unchanged from r45065, branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_license_novell.ycp branches/SuSE-SLE-10-SP2-Branch/firstboot/src/firstboot_network_write.ycp - copied unchanged from r45065, branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_network_write.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/firstboot/VERSION branches/SuSE-SLE-10-SP2-Branch/firstboot/package/yast2-firstboot.changes branches/SuSE-SLE-10-SP2-Branch/firstboot/scripts/Firstboot-Stage/S05-cleanup branches/SuSE-SLE-10-SP2-Branch/firstboot/src/Makefile.am branches/SuSE-SLE-10-SP2-Branch/firstboot/src/data/sysconfig.firstboot branches/SuSE-SLE-10-SP2-Branch/firstboot/src/firstboot.ycp branches/SuSE-SLE-10-SP2-Branch/firstboot/src/firstboot_language.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/firstboot/VERSION?rev=45066&r1=45065&r2=45066&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/firstboot/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/firstboot/VERSION Wed Feb 27 11:42:34 2008 @@ -1 +1 @@ -2.13.7 +2.13.10 Modified: branches/SuSE-SLE-10-SP2-Branch/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/firstboot/package/yast2-firstboot.changes?rev=45066&r1=45065&r2=45066&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/firstboot/package/yast2-firstboot.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/firstboot/package/yast2-firstboot.changes Wed Feb 27 11:42:34 2008 @@ -1,4 +1,26 @@ ------------------------------------------------------------------- +Wed Oct 24 17:43:40 CEST 2007 - jsrain@suse.cz + +- added firstboot_bootloader to recreate bootloader configuration +- 2.13.10 + +------------------------------------------------------------------- +Tue Oct 23 15:53:31 CEST 2007 - jsrain@suse.cz + +- initialize package callbacks, since some of the modules run + in the firstboot workflow expect them being initialized (#335979) +- 2.13.9 + +------------------------------------------------------------------- +Thu Aug 23 14:57:53 CEST 2007 - jsuchome@suse.cz + +- added support for keyboard and restaring network (#F302520) +- added one more client for showing the license + new value + FIRSTBOOT_NOVELL_LICENSE_DIR to /etc/sysconfig/firstboot (F302865) +- restart kbd after yast is finished (#303808) +- 2.13.8 + +------------------------------------------------------------------- Thu Mar 15 17:29:01 CET 2007 - jsuchome@suse.cz - unset LC_ALL before starting firstboot stage (#252780) Modified: branches/SuSE-SLE-10-SP2-Branch/firstboot/scripts/Firstboot-Stage/S05-cleanup URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/firstboot/scripts/Firstboot-Stage/S05-cleanup?rev=45066&r1=45065&r2=45066&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/firstboot/scripts/Firstboot-Stage/S05-cleanup (original) +++ branches/SuSE-SLE-10-SP2-Branch/firstboot/scripts/Firstboot-Stage/S05-cleanup Wed Feb 27 11:42:34 2008 @@ -42,4 +42,9 @@ rm -f $IFCFG_USB fi +if [ -e "/var/lib/YaST2/firstboot_kbd_restart" ] ; then + /etc/init.d/kbd restart + rm /var/lib/YaST2/firstboot_kbd_restart +fi + stop_unicode Modified: branches/SuSE-SLE-10-SP2-Branch/firstboot/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/firstboot/src/Makefile.am?rev=45066&r1=45065&r2=45066&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/firstboot/src/Makefile.am (original) +++ branches/SuSE-SLE-10-SP2-Branch/firstboot/src/Makefile.am Wed Feb 27 11:42:34 2008 @@ -11,7 +11,11 @@ firstboot_license.ycp \ firstboot_welcome.ycp \ firstboot_ssh.ycp \ - firstboot.ycp + firstboot_keyboard.ycp \ + firstboot.ycp \ + firstboot_license_novell.ycp \ + firstboot_network_write.ycp \ + firstboot_bootloader_reconfigure.ycp ynclude_DATA = \ routines.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/firstboot/src/data/sysconfig.firstboot URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/firstboot/src/data/sysconfig.firstboot?rev=45066&r1=45065&r2=45066&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/firstboot/src/data/sysconfig.firstboot (original) +++ branches/SuSE-SLE-10-SP2-Branch/firstboot/src/data/sysconfig.firstboot Wed Feb 27 11:42:34 2008 @@ -24,11 +24,18 @@ ## Default: "" # # Directory from which 'license.txt' and 'license_<locale>.txt' are read +# This are vendor-specific license texts FIRSTBOOT_LICENSE_DIR="" ## Type: string ## Default: "" # +# Directory from which 'license.txt' and 'license_<locale>.txt' are read +FIRSTBOOT_NOVELL_LICENSE_DIR="" + +## Type: string +## Default: "" +# # finish text file FIRSTBOOT_FINISH_FILE="" Modified: branches/SuSE-SLE-10-SP2-Branch/firstboot/src/firstboot.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/firstboot/src/firstboot.ycp?rev=45066&r1=45065&r2=45066&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/firstboot/src/firstboot.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/firstboot/src/firstboot.ycp Wed Feb 27 11:42:34 2008 @@ -13,6 +13,7 @@ import "Report"; import "Firstboot"; import "Misc"; + import "PackageCallbacksInit"; Wizard::OpenNextBackStepsDialog(); @@ -27,6 +28,9 @@ Report::LogErrors(true); Report::LogWarnings(true); + // initialize package callbacks, since some of the modules run in the + // firstboot workflow expect them to be initialized (bug #335979) + PackageCallbacksInit::InitPackageCallbacks (); symbol ret = ProductControl::Run(); y2milestone("ProductControl::Run() returned: %1", ret); Modified: branches/SuSE-SLE-10-SP2-Branch/firstboot/src/firstboot_language.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/firstboot/src/firstboot_language.ycp?rev=45066&r1=45065&r2=45066&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/firstboot/src/firstboot_language.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/firstboot/src/firstboot_language.ycp Wed Feb 27 11:42:34 2008 @@ -18,15 +18,16 @@ { textdomain "firstboot"; + import "Console"; import "Language"; import "Wizard"; import "Firstboot"; import "Popup"; - import "Label"; import "Encoding"; import "Mode"; import "GetInstArgs"; + import "ProductControl"; // Memozize the current language. // @@ -39,7 +40,9 @@ while (result == `again) { Wizard::SetDesktopIcon("language"); - result = WFM::CallFunction ("inst_language", [ GetInstArgs::argmap() ] ); + map args = GetInstArgs::argmap(); + args["first_run"] = "yes"; + result = WFM::CallFunction ("inst_language", [ args ] ); Wizard::RetranslateButtons (); } @@ -51,7 +54,6 @@ // y2milestone( "`cancel or `back --> restoring: <%1>", language_on_entry ); - import "Console"; import "Installation"; boolean use_utf8 = true; // utf8 is default @@ -82,10 +84,19 @@ { Firstboot::language_changed = true; Language::Save(); + Console::Save (); y2milestone( "Language changed --> saving" ); - - // popup text - Popup::Message( _("Your language setting has been changed. + boolean firstboot_keyboard = false; + foreach (map mod, ProductControl::getModules( "firstboot", Mode::mode (), `enabled), { + if (mod["name"]:"" == "firstboot_keyboard" && mod["enabled"]:false) + { + y2milestone ("keyboard will be configured -> no warning"); + firstboot_keyboard = true; + } + }); + 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 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org