[yast-commit] r41480 - in /trunk/firstboot: ./ package/ scripts/ scripts/Firstboot-Stage/ src/ src/data/

Author: jsuchome Date: Fri Oct 19 12:34:35 2007 New Revision: 41480 URL: http://svn.opensuse.org/viewcvs/yast?rev=41480&view=rev Log: changes from SLE10SP1: - 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) - unset LC_ALL before starting firstboot stage (#252780) - retranslate buttons after language module (#252780) - 2.16.0 Added: trunk/firstboot/src/firstboot_keyboard.ycp (with props) trunk/firstboot/src/firstboot_license_novell.ycp (with props) trunk/firstboot/src/firstboot_network_write.ycp (with props) Modified: trunk/firstboot/VERSION trunk/firstboot/package/yast2-firstboot.changes trunk/firstboot/scripts/Firstboot-Stage/S05-cleanup trunk/firstboot/scripts/firstboot trunk/firstboot/src/Makefile.am trunk/firstboot/src/data/sysconfig.firstboot trunk/firstboot/src/firstboot_language.ycp Modified: trunk/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/VERSION?rev=41480&r1=41479&r2=41480&view=diff ============================================================================== --- trunk/firstboot/VERSION (original) +++ trunk/firstboot/VERSION Fri Oct 19 12:34:35 2007 @@ -1 +1 @@ -2.15.1 +2.16.0 Modified: trunk/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboot.changes?rev=41480&r1=41479&r2=41480&view=diff ============================================================================== --- trunk/firstboot/package/yast2-firstboot.changes (original) +++ trunk/firstboot/package/yast2-firstboot.changes Fri Oct 19 12:34:35 2007 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Fri Oct 19 12:02:36 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) +- unset LC_ALL before starting firstboot stage (#252780) +- retranslate buttons after language module (#252780) +- 2.16.0 + +------------------------------------------------------------------- Wed Feb 28 11:49:25 CET 2007 - lslezak@suse.cz - Halt the system (configurable in LICENSE_REFUSAL_ACTION) if the Modified: trunk/firstboot/scripts/Firstboot-Stage/S05-cleanup URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/scripts/Firstboot-Stage/S05-cleanup?rev=41480&r1=41479&r2=41480&view=diff ============================================================================== --- trunk/firstboot/scripts/Firstboot-Stage/S05-cleanup (original) +++ trunk/firstboot/scripts/Firstboot-Stage/S05-cleanup Fri Oct 19 12:34:35 2007 @@ -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: trunk/firstboot/scripts/firstboot URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/scripts/firstboot?rev=41480&r1=41479&r2=41480&view=diff ============================================================================== --- trunk/firstboot/scripts/firstboot (original) +++ trunk/firstboot/scripts/firstboot Fri Oct 19 12:34:35 2007 @@ -50,6 +50,8 @@ case "$1" in start) echo -n "Configuring System for the first time.. " + # LC_ALL is set to POSIX, so unset it so YaST2.Firstboot can correctly set the language + unset LC_ALL ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. /usr/lib/YaST2/startup/YaST2.Firstboot 2>/dev/null Modified: trunk/firstboot/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/Makefile.am?rev=41480&r1=41479&r2=41480&view=diff ============================================================================== --- trunk/firstboot/src/Makefile.am (original) +++ trunk/firstboot/src/Makefile.am Fri Oct 19 12:34:35 2007 @@ -11,7 +11,10 @@ firstboot_license.ycp \ firstboot_welcome.ycp \ firstboot_ssh.ycp \ - firstboot.ycp + firstboot_keyboard.ycp \ + firstboot.ycp \ + firstboot_license_novell.ycp \ + firstboot_network_write.ycp ynclude_DATA = \ routines.ycp Modified: trunk/firstboot/src/data/sysconfig.firstboot URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/data/sysconfig.firstboot?rev=41480&r1=41479&r2=41480&view=diff ============================================================================== --- trunk/firstboot/src/data/sysconfig.firstboot (original) +++ trunk/firstboot/src/data/sysconfig.firstboot Fri Oct 19 12:34:35 2007 @@ -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="" Added: trunk/firstboot/src/firstboot_keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_keyboard.ycp?rev=41480&view=auto ============================================================================== --- trunk/firstboot/src/firstboot_keyboard.ycp (added) +++ trunk/firstboot/src/firstboot_keyboard.ycp Fri Oct 19 12:34:35 2007 @@ -0,0 +1,34 @@ +/** + * File : firstboot_keyboard.ycp + * Author : Jiri Suchomel + * Purpose : Firstboot configuratiuon of keyboard + * + * $Id$ + */ +{ + textdomain "country"; + + import "Arch"; + import "Directory"; + import "Keyboard"; + import "Firstboot"; + + include "keyboard/dialogs.ycp"; + + any ret = `auto; + if (Arch::s390 ()) + return ret; + + Keyboard::Read (); + + ret = KeyboardDialog ($[]); + + if (ret == `next) + { + Keyboard::Save (false); + // kbd must be restarted after YaST finishes (#303808) + SCR::Execute (.target.bash, sformat ("touch %1/firstboot_kbd_restart", 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=41480&r1=41479&r2=41480&view=diff ============================================================================== --- trunk/firstboot/src/firstboot_language.ycp (original) +++ trunk/firstboot/src/firstboot_language.ycp Fri Oct 19 12:34:35 2007 @@ -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,10 @@ 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 (); } y2milestone ("result '%1'", result); @@ -50,7 +54,6 @@ // y2milestone( "`cancel or `back --> restoring: <%1>", language_on_entry ); - import "Console"; import "Installation"; boolean use_utf8 = true; // utf8 is default @@ -81,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 Added: trunk/firstboot/src/firstboot_license_novell.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_license_novell.ycp?rev=41480&view=auto ============================================================================== --- trunk/firstboot/src/firstboot_license_novell.ycp (added) +++ trunk/firstboot/src/firstboot_license_novell.ycp Fri Oct 19 12:34:35 2007 @@ -0,0 +1,35 @@ +/* + * Module : firstboot_license_novell.ycp + * Authors: Ladislav Slezak , Jiri Suchomel + * Purpose: Display Novell license at the start of firstboot + * + * $Id$ + */ + +{ + textdomain "firstboot"; + + import "Misc"; + import "GetInstArgs"; + + + any result = nil; + + map args = GetInstArgs::argmap(); + args["directory"] = Misc::SysconfigRead(.sysconfig.firstboot.FIRSTBOOT_NOVELL_LICENSE_DIR, ""); + args["action"] = Misc::SysconfigRead(.sysconfig.firstboot.LICENSE_REFUSAL_ACTION, "abort"); + + y2milestone("inst_license options: %1", args); + + result = WFM::CallFunction( "inst_license", [ args ] ); + + if (result == `halt) + { + UI::CloseDialog(); + y2milestone("Halting the system..."); + SCR::Execute(.target.bash, "/sbin/halt"); + } + + return result; + +} Added: trunk/firstboot/src/firstboot_network_write.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_network_write.ycp?rev=41480&view=auto ============================================================================== --- trunk/firstboot/src/firstboot_network_write.ycp (added) +++ trunk/firstboot/src/firstboot_network_write.ycp Fri Oct 19 12:34:35 2007 @@ -0,0 +1,16 @@ +/** + * File : firstboot_network_write.ycp + * Author : Jiri Suchomel + * Purpose : Save network configuration + * (usable when network proposal was not run) + * $Id$ + */ +{ + // currently only restart the service, may be enhanced later + + import "Service"; + + Service::Restart ("network"); + + return `auto; +} -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org