Hello community,
here is the log from the commit of package yast2-firstboot for openSUSE:Factory
checked in at 2020-07-27 17:36:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-firstboot (Old)
and /work/SRC/openSUSE:Factory/.yast2-firstboot.new.3592 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-firstboot"
Mon Jul 27 17:36:51 2020 rev:94 rq:822961 version:4.3.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-firstboot/yast2-firstboot.changes
2020-07-21 15:48:30.068155524 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-firstboot.new.3592/yast2-firstboot.changes
2020-07-27 17:37:03.582807280 +0200
@@ -1,0 +2,13 @@
+Mon Jul 27 09:05:35 UTC 2020 - Josef Reidinger <jreidin...@suse.com>
+
+- Handle exceptions when parsing xml file (related to bsc#1170886)
+- 4.3.3
+
+-------------------------------------------------------------------
+Thu Jul 23 14:27:02 UTC 2020 - José Iván López González <jlo...@suse.com>
+
+- Configure the wizard layout according to the product features.
+- Related to jsc#PM-1998.
+- 4.3.2
+
+-------------------------------------------------------------------
Old:
----
yast2-firstboot-4.3.1.tar.bz2
New:
----
yast2-firstboot-4.3.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-firstboot.spec ++++++
--- /var/tmp/diff_new_pack.MZOits/_old 2020-07-27 17:37:04.358808036 +0200
+++ /var/tmp/diff_new_pack.MZOits/_new 2020-07-27 17:37:04.362808040 +0200
@@ -17,7 +17,7 @@
Name: yast2-firstboot
-Version: 4.3.1
+Version: 4.3.3
Release: 0
Summary: YaST2 - Initial System Configuration
License: GPL-2.0-only
@@ -33,8 +33,8 @@
BuildRequires: yast2-devtools >= 4.2.2
PreReq: %fillup_prereq
-# yast2/NeworkDevices -> yast2/NetworkInterfaces
-Requires: yast2 >= 2.16.23
+# UI::Wizards::Layout
+Requires: yast2 >= 4.3.16
# Language::SwitchToEnglishIfNeeded
Requires: yast2-country >= 2.19.5
# Rely on the YaST2-Firstboot.service for halting the system on failure
++++++ yast2-firstboot-4.3.1.tar.bz2 -> yast2-firstboot-4.3.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firstboot-4.3.1/control/firstboot.xml
new/yast2-firstboot-4.3.3/control/firstboot.xml
--- old/yast2-firstboot-4.3.1/control/firstboot.xml 2020-07-17
14:16:51.000000000 +0200
+++ new/yast2-firstboot-4.3.3/control/firstboot.xml 2020-07-27
12:54:00.000000000 +0200
@@ -10,6 +10,11 @@
<textdomain>firstboot</textdomain>
+ <!---
+ See
https://github.com/yast/yast-installation/blob/master/doc/control-file.md for
more
+ explanation about the control file settings.
+ -->
+
<globals>
<!--
@@ -26,9 +31,18 @@
<!-- The default value of "Automatic Login" checkbox -->
<enable_autologin config:type="boolean">false</enable_autologin>
+ <!-- This option is deprecated in favor of installation-layout -->
+ <!-- <installation_ui>sidebar</installation_ui> -->
+
+ <!-- Configuration of the installation/firstboot layout -->
+ <installation_layout>
+ <mode>steps</mode>
+ <banner config:type="boolean">false</banner>
+ </installation_layout>
+
<!--
For more variables that can be in this section, look into the control
file
- (/etc/YaST2/control.xml or root directory of installation media)
+ (/etc/YaST2/control.xml or root directory of installation media).
-->
</globals>
<proposals config:type="list">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-firstboot-4.3.1/package/yast2-firstboot.changes
new/yast2-firstboot-4.3.3/package/yast2-firstboot.changes
--- old/yast2-firstboot-4.3.1/package/yast2-firstboot.changes 2020-07-17
14:16:51.000000000 +0200
+++ new/yast2-firstboot-4.3.3/package/yast2-firstboot.changes 2020-07-27
12:54:00.000000000 +0200
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Mon Jul 27 09:05:35 UTC 2020 - Josef Reidinger <jreidin...@suse.com>
+
+- Handle exceptions when parsing xml file (related to bsc#1170886)
+- 4.3.3
+
+-------------------------------------------------------------------
+Thu Jul 23 14:27:02 UTC 2020 - José Iván López González <jlo...@suse.com>
+
+- Configure the wizard layout according to the product features.
+- Related to jsc#PM-1998.
+- 4.3.2
+
+-------------------------------------------------------------------
Thu Jul 16 09:15:57 UTC 2020 - Knut Anderssen <kanders...@suse.com>
- Fix firsboot_hostname client crash (bsc#1173298)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firstboot-4.3.1/package/yast2-firstboot.spec
new/yast2-firstboot-4.3.3/package/yast2-firstboot.spec
--- old/yast2-firstboot-4.3.1/package/yast2-firstboot.spec 2020-07-17
14:16:51.000000000 +0200
+++ new/yast2-firstboot-4.3.3/package/yast2-firstboot.spec 2020-07-27
12:54:00.000000000 +0200
@@ -16,7 +16,7 @@
#
Name: yast2-firstboot
-Version: 4.3.1
+Version: 4.3.3
Release: 0
Summary: YaST2 - Initial System Configuration
Group: System/YaST
@@ -32,8 +32,8 @@
BuildRequires: ruby
PreReq: %fillup_prereq
-# yast2/NeworkDevices -> yast2/NetworkInterfaces
-Requires: yast2 >= 2.16.23
+# UI::Wizards::Layout
+Requires: yast2 >= 4.3.16
# Language::SwitchToEnglishIfNeeded
Requires: yast2-country >= 2.19.5
# Rely on the YaST2-Firstboot.service for halting the system on failure
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firstboot-4.3.1/src/clients/firstboot.rb
new/yast2-firstboot-4.3.3/src/clients/firstboot.rb
--- old/yast2-firstboot-4.3.1/src/clients/firstboot.rb 2020-07-17
14:16:51.000000000 +0200
+++ new/yast2-firstboot-4.3.3/src/clients/firstboot.rb 2020-07-27
12:54:00.000000000 +0200
@@ -23,6 +23,7 @@
#
# $Id$
+require "ui/wizards/layout"
require "shellwords"
module Yast
@@ -45,53 +46,56 @@
Yast.import "PackageCallbacksInit"
Yast.import "Keyboard"
- Wizard.OpenNextBackStepsDialog
-
# Always force the mode (bsc#924278)
Mode.SetMode("installation")
- ProductControl.AddWizardSteps([{ "stage" => "firstboot", "mode" =>
"installation" }])
- # Do log Report messages by default (#180862)
- Report.LogMessages(true)
- Report.LogErrors(true)
- Report.LogWarnings(true)
-
- # Just in case /etc/X11/xorg.conf.d/00-keyboard.conf has not been
- # generated yet (the X server started by YaST-Firstboot doesn't seem to
- # be enough to trigger the systemd mechanism that generates it), let's
- # enforce the keyboard map if we are running in graphic mode (bsc#950335)
- Keyboard.Set(Keyboard.current_kbd) unless Yast::Arch.is_wsl
-
- # initialize package callbacks, since some of the modules run in the
- # firstboot workflow expect them to be initialized (bug #335979)
- PackageCallbacksInit.InitPackageCallbacks
-
- UI.SetProductName(Product.name)
-
- @ret = ProductControl.Run
- Builtins.y2milestone("ProductControl::Run() returned: %1", @ret)
-
- Pkg.SourceFinishAll
- Pkg.TargetFinish
-
- if @ret == :next || @ret == :finish
- @action = Misc.SysconfigRead(
- path(".sysconfig.firstboot.FIRSTBOOT_FINISH_ACTION"),
- ""
+ layout = ::UI::Wizards::Layout.from_product_features
+
+ layout.open_wizard do
+ Yast::ProductControl.AddWizardSteps(
+ [{ "stage" => "firstboot", "mode" => "installation" }]
)
- if @action == "reboot"
- SCR.Execute(
- path(".target.bash"),
- Builtins.sformat(
- "/usr/bin/touch %1/firstboot_reboot_after_finish",
- Directory.vardir.shellescape
- )
+
+ # Do log Report messages by default (#180862)
+ Report.LogMessages(true)
+ Report.LogErrors(true)
+ Report.LogWarnings(true)
+
+ # Just in case /etc/X11/xorg.conf.d/00-keyboard.conf has not been
+ # generated yet (the X server started by YaST-Firstboot doesn't seem to
+ # be enough to trigger the systemd mechanism that generates it), let's
+ # enforce the keyboard map if we are running in graphic mode
(bsc#950335)
+ Keyboard.Set(Keyboard.current_kbd) unless Yast::Arch.is_wsl
+
+ # initialize package callbacks, since some of the modules run in the
+ # firstboot workflow expect them to be initialized (bug #335979)
+ PackageCallbacksInit.InitPackageCallbacks
+
+ UI.SetProductName(Product.name)
+
+ @ret = ProductControl.Run
+ Builtins.y2milestone("ProductControl::Run() returned: %1", @ret)
+
+ Pkg.SourceFinishAll
+ Pkg.TargetFinish
+
+ if @ret == :next || @ret == :finish
+ @action = Misc.SysconfigRead(
+ path(".sysconfig.firstboot.FIRSTBOOT_FINISH_ACTION"),
+ ""
)
+ if @action == "reboot"
+ SCR.Execute(
+ path(".target.bash"),
+ Builtins.sformat(
+ "/usr/bin/touch %1/firstboot_reboot_after_finish",
+ Directory.vardir.shellescape
+ )
+ )
+ end
end
end
- UI.CloseDialog
-
# handle abort
if @ret == :abort
# do the same action as if the license has not been accepted
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-firstboot-4.3.1/src/clients/firstboot_config.rb
new/yast2-firstboot-4.3.3/src/clients/firstboot_config.rb
--- old/yast2-firstboot-4.3.1/src/clients/firstboot_config.rb 2020-07-17
14:16:51.000000000 +0200
+++ new/yast2-firstboot-4.3.3/src/clients/firstboot_config.rb 2020-07-27
12:54:00.000000000 +0200
@@ -30,6 +30,9 @@
#**
# <h3>Configuration of firstboot</h3>
+
+require "yast2/popup"
+
module Yast
class FirstbootConfigClient < Client
def main
@@ -137,8 +140,13 @@
)
Ops.set(@orig_workflow, "modules", @modules)
Ops.set(@all, ["workflows", 0], @orig_workflow)
- XML.YCPToXMLFile(:firstboot, @all, "/tmp/firstboot.xml")
- break
+ begin
+ XML.YCPToXMLFile(:firstboot, @all, "/tmp/firstboot.xml")
+ break
+ rescue XMLSerializationError => e
+ Yast2::Popup.show(_("Failed to create configuration file."),
+ headline: :error, details: e.message)
+ end
end
end
Wizard.CloseDialog
