Author: jsuchome Date: Tue Jul 7 10:09:35 2009 New Revision: 57876 URL: http://svn.opensuse.org/viewcvs/yast?rev=57876&view=rev Log: - added option to do reboot at the end of firstboot (bnc#514745) - 2.18.4 Modified: trunk/firstboot/doc/firstboot-section_mod.xml trunk/firstboot/package/yast2-firstboot.changes trunk/firstboot/scripts/Firstboot-Stage/S09-cleanup trunk/firstboot/src/Firstboot.ycp trunk/firstboot/src/data/sysconfig.firstboot trunk/firstboot/src/firstboot.ycp Modified: trunk/firstboot/doc/firstboot-section_mod.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/doc/firstboot-section_mod.xml?rev=57876&r1=57875&r2=57876&view=diff ============================================================================== --- trunk/firstboot/doc/firstboot-section_mod.xml (original) +++ trunk/firstboot/doc/firstboot-section_mod.xml Tue Jul 7 10:09:35 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: trunk/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboot.changes?rev=57876&r1=57875&r2=57876&view=diff ============================================================================== --- trunk/firstboot/package/yast2-firstboot.changes (original) +++ trunk/firstboot/package/yast2-firstboot.changes Tue Jul 7 10:09:35 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jul 7 10:06:25 CEST 2009 - jsuchome@suse.cz + +- added option to do reboot at the end of firstboot (bnc#514745) +- 2.18.4 + +------------------------------------------------------------------- Thu Jun 18 09:23:36 CEST 2009 - jsuchome@suse.cz - 2.18.3 Modified: trunk/firstboot/scripts/Firstboot-Stage/S09-cleanup URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/scripts/Firstboot-Stage/S09-cleanup?rev=57876&r1=57875&r2=57876&view=diff ============================================================================== --- trunk/firstboot/scripts/Firstboot-Stage/S09-cleanup (original) +++ trunk/firstboot/scripts/Firstboot-Stage/S09-cleanup Tue Jul 7 10:09:35 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: trunk/firstboot/src/Firstboot.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/Firstboot.ycp?rev=57876&r1=57875&r2=57876&view=diff ============================================================================== --- trunk/firstboot/src/Firstboot.ycp (original) +++ trunk/firstboot/src/Firstboot.ycp Tue Jul 7 10:09:35 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: trunk/firstboot/src/data/sysconfig.firstboot URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/data/sysconfig.firstboot?rev=57876&r1=57875&r2=57876&view=diff ============================================================================== --- trunk/firstboot/src/data/sysconfig.firstboot (original) +++ trunk/firstboot/src/data/sysconfig.firstboot Tue Jul 7 10:09:35 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: trunk/firstboot/src/firstboot.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot.ycp?rev=57876&r1=57875&r2=57876&view=diff ============================================================================== --- trunk/firstboot/src/firstboot.ycp (original) +++ trunk/firstboot/src/firstboot.ycp Tue Jul 7 10:09:35 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