Merge pull request #516 from yast/fix_firstboot

Fix firstboot
yast · Oct 27, 2020 · 895d920 · 895d920
2 parents 534dd28 + a2f9a2f
commit 895d920
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/package/yast2-registration.changes b/package/yast2-registration.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Oct 27 15:50:31 UTC 2020 - Josef Reidinger <jreidinger@suse.com>
+
+- Fix the latest change to work in firstboot when system is
+  registered (bsc#1178128)
+- 4.2.45
+
 -------------------------------------------------------------------
 Wed Oct 14 15:26:24 CEST 2020 - schubi@suse.de
 

diff --git a/package/yast2-registration.spec b/package/yast2-registration.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-registration
-Version:        4.2.44
+Version:        4.2.45
 Release:        0
 Summary:        YaST2 - Registration Module
 License:        GPL-2.0-only

diff --git a/src/lib/registration/clients/inst_scc.rb b/src/lib/registration/clients/inst_scc.rb
@@ -226,6 +226,8 @@ def registration_check
       return :register unless ::Registration::Registration.is_registered?
 
       log.info "The system is already registered, displaying registered dialog"
+      # ensure that @registration is initialized
+      return :cancel if init_registration == :cancel
       ::Registration::UI::RegisteredSystemDialog.run(
         extensions_enabled: !Registration::Addon.find_all(@registration).empty?
       )