Author: jsuchome Date: Tue Jul 7 10:10:11 2009 New Revision: 57877 URL: http://svn.opensuse.org/viewcvs/yast?rev=57877&view=rev Log: - start the services before YaST (bnc#475169) - set the reasonable value for LC_ALL (bnc#478812) - added option to do reboot at the end of firstboot (bnc#514745) - 2.17.9 Modified: branches/SuSE-Code-11-Branch/firstboot/VERSION branches/SuSE-Code-11-Branch/firstboot/doc/firstboot-section_mod.xml branches/SuSE-Code-11-Branch/firstboot/package/yast2-firstboot.changes branches/SuSE-Code-11-Branch/firstboot/scripts/Firstboot-Stage/S08-start branches/SuSE-Code-11-Branch/firstboot/scripts/Firstboot-Stage/S09-cleanup branches/SuSE-Code-11-Branch/firstboot/src/Firstboot.ycp branches/SuSE-Code-11-Branch/firstboot/src/control/firstboot.xml branches/SuSE-Code-11-Branch/firstboot/src/data/sysconfig.firstboot branches/SuSE-Code-11-Branch/firstboot/src/firstboot.ycp Modified: branches/SuSE-Code-11-Branch/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/firstboot/VERSION?rev=57877&r1=57876&r2=57877&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/firstboot/VERSION (original) +++ branches/SuSE-Code-11-Branch/firstboot/VERSION Tue Jul 7 10:10:11 2009 @@ -1 +1 @@ -2.17.8 +2.17.9 Modified: branches/SuSE-Code-11-Branch/firstboot/doc/firstboot-section_mod.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/firstboot/doc/firstboot-section_mod.xml?rev=57877&r1=57876&r2=57877&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/firstboot/doc/firstboot-section_mod.xml (original) +++ branches/SuSE-Code-11-Branch/firstboot/doc/firstboot-section_mod.xml Tue Jul 7 10:10:11 2009 @@ -167,6 +167,11 @@ </itemizedlist> </section> <section> + <title>Reboot at the end</title> + <para>It is possible to force reboot at the end of firstboot workflow. To do so, set the value of sysconfig variable FIRSTBOOT_FINISH_ACTION to "reboot". + </para> + </section> + <section> <title>Release Notes</title> <para>Use the configuration option FIRSTBOOT_RELEASE_NOTES_PATH to show release notes in the target language. The value of the option should Modified: branches/SuSE-Code-11-Branch/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/firstboot/package/yast2-firstboot.changes?rev=57877&r1=57876&r2=57877&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/firstboot/package/yast2-firstboot.changes (original) +++ branches/SuSE-Code-11-Branch/firstboot/package/yast2-firstboot.changes Tue Jul 7 10:10:11 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Jul 7 09:50:06 CEST 2009 - jsuchome@suse.cz + +- start the services before YaST (bnc#475169) +- set the reasonable value for LC_ALL (bnc#478812) +- added option to do reboot at the end of firstboot (bnc#514745) +- 2.17.9 + +------------------------------------------------------------------- Mon Jun 1 13:02:52 CEST 2009 - jsuchome@suse.cz - grab texts from firstboot.xml when creating pot file (bnc#479571) Modified: branches/SuSE-Code-11-Branch/firstboot/scripts/Firstboot-Stage/S08-start URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/firstboot/scripts/Firstboot-Stage/S08-start?rev=57877&r1=57876&r2=57877&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/firstboot/scripts/Firstboot-Stage/S08-start (original) +++ branches/SuSE-Code-11-Branch/firstboot/scripts/Firstboot-Stage/S08-start Tue Jul 7 10:10:11 2009 @@ -1,5 +1,5 @@ #!/bin/sh -log "Starting S04-start..." +log "Starting S08-start..." log "=====================" Modified: branches/SuSE-Code-11-Branch/firstboot/scripts/Firstboot-Stage/S09-cleanup URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/firstboot/scripts/Firstboot-Stage/S09-cleanup?rev=57877&r1=57876&r2=57877&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/firstboot/scripts/Firstboot-Stage/S09-cleanup (original) +++ branches/SuSE-Code-11-Branch/firstboot/scripts/Firstboot-Stage/S09-cleanup Tue Jul 7 10:10:11 2009 @@ -48,3 +48,11 @@ fi stop_unicode + +if [ -e "/var/lib/YaST2/firstboot_reboot_after_finish" ] ; then + log "\tRebooting system as requested by firstboot..." + rm /var/lib/YaST2/firstboot_reboot_after_finish + /sbin/reboot +fi + + Modified: branches/SuSE-Code-11-Branch/firstboot/src/Firstboot.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/firstboot/src/Firstboot.ycp?rev=57877&r1=57876&r2=57877&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/firstboot/src/Firstboot.ycp (original) +++ branches/SuSE-Code-11-Branch/firstboot/src/Firstboot.ycp Tue Jul 7 10:10:11 2009 @@ -95,7 +95,7 @@ if (script_dir!="") { - list<string> scripts = (list<string>)SCR::Read(.target.dir, script_dir); + list<string> scripts = sort ((list<string>)SCR::Read(.target.dir, script_dir)); foreach(string script, scripts, ``{ map ret = (map)SCR::Execute(.target.bash_output, script_dir + "/" + script + " >> /var/log/YaST2/firstboot.log"); if (ret["exit"]:-1 != 0) Modified: branches/SuSE-Code-11-Branch/firstboot/src/control/firstboot.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/firstboot/src/control/firstboot.xml?rev=57877&r1=57876&r2=57877&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/firstboot/src/control/firstboot.xml (original) +++ branches/SuSE-Code-11-Branch/firstboot/src/control/firstboot.xml Tue Jul 7 10:10:11 2009 @@ -77,6 +77,11 @@ <name>firstboot_language</name> </module> <module> + <label>Keyboard Layout</label> + <enabled config:type="boolean">false</enabled> + <name>firstboot_keyboard</name> + </module> + <module> <label>Welcome</label> <name>firstboot_welcome</name> </module> @@ -147,6 +152,11 @@ <name>inst_user</name> </module> <module> + <label>Customer Center</label> + <name>inst_suse_register</name> + <enabled config:type="boolean">false</enabled> + </module> + <module> <label>Hardware</label> <name>inst_proposal</name> <enabled config:type="boolean">false</enabled> Modified: branches/SuSE-Code-11-Branch/firstboot/src/data/sysconfig.firstboot URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/firstboot/src/data/sysconfig.firstboot?rev=57877&r1=57876&r2=57877&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/firstboot/src/data/sysconfig.firstboot (original) +++ branches/SuSE-Code-11-Branch/firstboot/src/data/sysconfig.firstboot Tue Jul 7 10:10:11 2009 @@ -63,6 +63,12 @@ # What to do if the user did not accept the license LICENSE_REFUSAL_ACTION="halt" +## Type: string(reboot) +## Default: "" +# +# Action that should be done after the firstboot sequence finishes. +FIRSTBOOT_FINISH_ACTION="" + ## Type: string ## Default: "" Modified: branches/SuSE-Code-11-Branch/firstboot/src/firstboot.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/firstboot/src/firstboot.ycp?rev=57877&r1=57876&r2=57877&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/firstboot/src/firstboot.ycp (original) +++ branches/SuSE-Code-11-Branch/firstboot/src/firstboot.ycp Tue Jul 7 10:10:11 2009 @@ -6,6 +6,7 @@ { textdomain "firstboot"; + import "Directory"; import "Mode"; import "Stage"; import "ProductControl"; @@ -38,6 +39,15 @@ Pkg::SourceFinishAll(); Pkg::TargetFinish(); + if (ret == `next || ret == `finish) + { + string action = Misc::SysconfigRead(.sysconfig.firstboot.FIRSTBOOT_FINISH_ACTION, ""); + if (action == "reboot") + { + SCR::Execute (.target.bash, sformat ("touch %1/firstboot_reboot_after_finish", Directory::vardir)); + } + } + UI::CloseDialog(); // handle abort -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org