Hello community, here is the log from the commit of package yast2-firstboot for openSUSE:Factory checked in at 2018-06-20 15:22:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-firstboot (Old) and /work/SRC/openSUSE:Factory/.yast2-firstboot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-firstboot" Wed Jun 20 15:22:57 2018 rev:72 rq:616348 version:4.0.5 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-firstboot/yast2-firstboot.changes 2018-03-22 12:11:37.283685470 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-firstboot.new/yast2-firstboot.changes 2018-06-20 15:23:07.739984681 +0200 @@ -1,0 +2,6 @@ +Mon Jun 11 11:10:40 UTC 2018 - [email protected] + +- Allow going back from finish step and unified halt (bsc#1095253) +- 4.0.5 + +------------------------------------------------------------------- Old: ---- yast2-firstboot-4.0.4.tar.bz2 New: ---- yast2-firstboot-4.0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firstboot.spec ++++++ --- /var/tmp/diff_new_pack.yJQEXz/_old 2018-06-20 15:23:09.807909678 +0200 +++ /var/tmp/diff_new_pack.yJQEXz/_new 2018-06-20 15:23:09.811909533 +0200 @@ -17,7 +17,7 @@ Name: yast2-firstboot -Version: 4.0.4 +Version: 4.0.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -32,8 +32,8 @@ Requires: yast2 >= 2.16.23 # Language::SwitchToEnglishIfNeeded Requires: yast2-country >= 2.19.5 -# new version of inst_license -Requires: yast2-installation >= 2.19.0 +# Rely on the YaST2-Firstboot.service for halting the system on failure +Requires: yast2-installation >= 4.1.2 # network autoconfiguration Requires: yast2-network >= 3.1.91 ++++++ yast2-firstboot-4.0.4.tar.bz2 -> yast2-firstboot-4.0.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-4.0.4/package/yast2-firstboot.changes new/yast2-firstboot-4.0.5/package/yast2-firstboot.changes --- old/yast2-firstboot-4.0.4/package/yast2-firstboot.changes 2018-03-21 12:14:38.000000000 +0100 +++ new/yast2-firstboot-4.0.5/package/yast2-firstboot.changes 2018-06-12 17:40:06.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jun 11 11:10:40 UTC 2018 - [email protected] + +- Allow going back from finish step and unified halt (bsc#1095253) +- 4.0.5 + +------------------------------------------------------------------- Tue Mar 20 16:35:46 UTC 2018 - [email protected] - Added firstboot.glade symlink to include also the firstboot.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-4.0.4/package/yast2-firstboot.spec new/yast2-firstboot-4.0.5/package/yast2-firstboot.spec --- old/yast2-firstboot-4.0.4/package/yast2-firstboot.spec 2018-03-21 12:14:38.000000000 +0100 +++ new/yast2-firstboot-4.0.5/package/yast2-firstboot.spec 2018-06-12 17:40:06.000000000 +0200 @@ -16,7 +16,7 @@ # Name: yast2-firstboot -Version: 4.0.4 +Version: 4.0.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -31,8 +31,8 @@ Requires: yast2 >= 2.16.23 # Language::SwitchToEnglishIfNeeded Requires: yast2-country >= 2.19.5 -# new version of inst_license -Requires: yast2-installation >= 2.19.0 +# Rely on the YaST2-Firstboot.service for halting the system on failure +Requires: yast2-installation >= 4.1.2 # network autoconfiguration Requires: yast2-network >= 3.1.91 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-4.0.4/scripts/Firstboot-Stage/S09-cleanup new/yast2-firstboot-4.0.5/scripts/Firstboot-Stage/S09-cleanup --- old/yast2-firstboot-4.0.4/scripts/Firstboot-Stage/S09-cleanup 2018-03-21 12:14:38.000000000 +0100 +++ new/yast2-firstboot-4.0.5/scripts/Firstboot-Stage/S09-cleanup 2018-06-12 17:40:06.000000000 +0200 @@ -49,3 +49,12 @@ rm /var/lib/YaST2/firstboot_reboot_after_finish /sbin/reboot fi + +if [ -e "/var/lib/YaST2/firstboot_halt_after_finish" ] ; then + log "\tHalting system as requested by firstboot..." + rm /var/lib/YaST2/firstboot_halt_after_finish + # Instead of calling halt directly we will rely on systemd + # failed state, that is OnFailure=shutdown.target in the + # YaST2-Firstboot.service (bsc#1095251) + exit 1 +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-4.0.4/src/clients/firstboot.rb new/yast2-firstboot-4.0.5/src/clients/firstboot.rb --- old/yast2-firstboot-4.0.4/src/clients/firstboot.rb 2018-03-21 12:14:38.000000000 +0100 +++ new/yast2-firstboot-4.0.5/src/clients/firstboot.rb 2018-06-12 17:40:06.000000000 +0200 @@ -97,12 +97,24 @@ @action ) + # The S09-cleanup script is responsible of rebooting or halting the + # system depending on the existence of the specifig flag files if @action == "halt" Builtins.y2milestone("Halting the system...") - SCR.Execute(path(".target.bash"), "/sbin/halt") + SCR.Execute(path(".target.bash"), + Builtins.sformat( + "touch %1/firstboot_halt_after_finish", + Directory.vardir + ) + ) elsif @action == "reboot" Builtins.y2milestone("Rebooting the system...") - SCR.Execute(path(".target.bash"), "/sbin/reboot") + SCR.Execute(path(".target.bash"), + Builtins.sformat( + "touch %1/firstboot_reboot_after_finish", + Directory.vardir + ) + ) elsif @action == "continue" Builtins.y2milestone("Finishing Yast...") else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-4.0.4/src/clients/firstboot_finish.rb new/yast2-firstboot-4.0.5/src/clients/firstboot_finish.rb --- old/yast2-firstboot-4.0.4/src/clients/firstboot_finish.rb 2018-03-21 12:14:38.000000000 +0100 +++ new/yast2-firstboot-4.0.5/src/clients/firstboot_finish.rb 2018-06-12 17:40:06.000000000 +0200 @@ -142,6 +142,7 @@ GetInstArgs.enable_next ) + Wizard.HideAbortButton Wizard.SetNextButton(:next, Label.FinishButton) Wizard.SetFocusToNextButton diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-4.0.4/src/clients/firstboot_license.rb new/yast2-firstboot-4.0.5/src/clients/firstboot_license.rb --- old/yast2-firstboot-4.0.4/src/clients/firstboot_license.rb 2018-03-21 12:14:38.000000000 +0100 +++ new/yast2-firstboot-4.0.5/src/clients/firstboot_license.rb 2018-06-12 17:40:06.000000000 +0200 @@ -59,11 +59,7 @@ @result = WFM.CallFunction("inst_license", [@args]) - if @result == :halt - UI.CloseDialog - Builtins.y2milestone("Halting the system...") - SCR.Execute(path(".target.bash"), "/sbin/halt") - end + UI.CloseDialog if @result == :halt deep_copy(@result) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-4.0.4/src/clients/firstboot_license_novell.rb new/yast2-firstboot-4.0.5/src/clients/firstboot_license_novell.rb --- old/yast2-firstboot-4.0.4/src/clients/firstboot_license_novell.rb 2018-03-21 12:14:38.000000000 +0100 +++ new/yast2-firstboot-4.0.5/src/clients/firstboot_license_novell.rb 2018-06-12 17:40:06.000000000 +0200 @@ -69,11 +69,7 @@ @result = WFM.CallFunction("inst_license", [@args]) - if @result == :halt - UI.CloseDialog - Builtins.y2milestone("Halting the system...") - SCR.Execute(path(".target.bash"), "/sbin/halt") - end + UI.CloseDialog if @result == :halt deep_copy(@result) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-4.0.4/src/clients/firstboot_licenses.rb new/yast2-firstboot-4.0.5/src/clients/firstboot_licenses.rb --- old/yast2-firstboot-4.0.4/src/clients/firstboot_licenses.rb 2018-03-21 12:14:38.000000000 +0100 +++ new/yast2-firstboot-4.0.5/src/clients/firstboot_licenses.rb 2018-06-12 17:40:06.000000000 +0200 @@ -71,11 +71,7 @@ @result = WFM.CallFunction("inst_license", [@args]) - if @result == :halt - UI.CloseDialog - Builtins.y2milestone("Halting the system...") - SCR.Execute(path(".target.bash"), "/sbin/halt") - end + UI.CloseDialog if @result == :halt deep_copy(@result) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-4.0.4/src/clients/firstboot_write.rb new/yast2-firstboot-4.0.5/src/clients/firstboot_write.rb --- old/yast2-firstboot-4.0.4/src/clients/firstboot_write.rb 2018-03-21 12:14:38.000000000 +0100 +++ new/yast2-firstboot-4.0.5/src/clients/firstboot_write.rb 2018-06-12 17:40:06.000000000 +0200 @@ -39,6 +39,7 @@ Yast.import "ProductFeatures" Yast.import "Wizard" + return :back if GetInstArgs.going_back @progress_stages = [ # progress stages @@ -94,10 +95,6 @@ Firstboot.default_wm ) - - # Dont run firstboot next time - SCR.Execute(path(".target.remove"), Firstboot.reconfig_file) - # save product features if they do not exist if !FileUtils.Exists("/etc/YaST2/ProductFeatures") Builtins.y2milestone("Saving ProductFeatures...")
