Merge pull request #63 from lnussel/master

firstboot fixes
yast · Apr 11, 2019 · 172a6d4 · 172a6d4
2 parents 2219b2a + 8d89a07
commit 172a6d4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/control/firstboot.xml b/control/firstboot.xml
@@ -106,16 +106,6 @@
                     <label>Welcome</label>
                     <name>firstboot_welcome</name>
                 </module>
-                <module>
-                    <label>License Agreements</label>
-                    <enabled config:type="boolean">false</enabled>
-                    <name>firstboot_licenses</name>
-                </module>
-                <module>
-                    <label>License Agreement</label>
-                    <enabled config:type="boolean">true</enabled>
-                    <name>firstboot_license_novell</name>
-                </module>
                 <module>
                     <label>License Agreement</label>
                     <enabled config:type="boolean">true</enabled>

diff --git a/package/yast2-firstboot.changes b/package/yast2-firstboot.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr 11 09:25:14 UTC 2019 - lnussel@suse.de
+
+- Disable duplicate license dialogs (boo#131301)
+- Initialize product in firstboot (boo#1132189)
+- 4.1.6
+
 -------------------------------------------------------------------
 Fri Feb  8 07:25:32 UTC 2019 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 

diff --git a/package/yast2-firstboot.spec b/package/yast2-firstboot.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-firstboot
-Version:        4.1.5
+Version:        4.1.6
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/clients/firstboot.rb b/src/clients/firstboot.rb
@@ -35,6 +35,7 @@ def main
       Yast.import "Directory"
       Yast.import "Mode"
       Yast.import "Stage"
+      Yast.import "Product"
       Yast.import "ProductControl"
       Yast.import "Wizard"
       Yast.import "Report"
@@ -64,6 +65,8 @@ def main
       # 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)