Merge pull request #158 from yast/merge-sle-15-sp5

Merge SLE-15-SP5 into SLE-15-SP6
yast · Aug 5, 2024 · 7464639 · 7464639
2 parents 33bff04 + 2d6d869
commit 7464639
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/package/yast2-security.changes b/package/yast2-security.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Oct 30 09:09:26 UTC 2023 - Knut Anderssen <kanderssen@suse.com>
+
+- Do not load the security settings from the security policy until
+  needed (bsc#1216615).
+- 4.6.1
+
 -------------------------------------------------------------------
 Fri Sep 01 19:57:03 UTC 2023 - Josef Reidinger <jreidinger@suse.com>
 

diff --git a/package/yast2-security.spec b/package/yast2-security.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-security
-Version:        4.6.0
+Version:        4.6.1
 Release:        0
 Group:          System/YaST
 License:        GPL-2.0-only

diff --git a/src/lib/y2security/security_policies/target_config.rb b/src/lib/y2security/security_policies/target_config.rb
@@ -41,17 +41,19 @@ class TargetConfig
       # @return [Bootloader::BootloaderFactory]
       attr_accessor :bootloader
 
-      # @return [Y2Network::Config]
-      attr_accessor :network
-
-      # @return [Installation::SecuritySettings, nil] nil if yast2-installation is not available
-      attr_accessor :security
-
       def initialize
         @storage = default_devicegraph
-        @network = default_network_config
         @bootloader = default_bootloader
-        @security = default_security_settings
+      end
+
+      # @return [Y2Network::Config]
+      def network
+        default_network_config
+      end
+
+      # @return [Installation::SecuritySettings, nil] nil if yast2-installation is not available
+      def security
+        default_security_settings
       end
 
       # Default devicegraph