Merge pull request #150 from joseivanlopez/y2users

Use Security Settings
yast · Jun 21, 2021 · e19fff6 · e19fff6
2 parents b9e50c7 + ba6bce8
commit e19fff6
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 1,325 deletions.
diff --git a/package/yast2-firewall.changes b/package/yast2-firewall.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun 16 12:33:45 UTC 2021 - José Iván López González <jlopez@suse.com>
+
+- Use Installation::SecuritySettings (related to jsc#PM-2620).
+- 4.4.1
+
 -------------------------------------------------------------------
 Tue Apr 20 13:51:55 UTC 2021 - Ladislav Slezák <lslezak@suse.cz>
 

diff --git a/package/yast2-firewall.spec b/package/yast2-firewall.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-firewall
-Version:        4.4.0
+Version:        4.4.1
 Release:        0
 Summary:        YaST2 - Firewall Configuration
 Group:          System/YaST

diff --git a/src/clients/firewall_finish.rb b/src/clients/firewall_finish.rb
diff --git a/src/clients/firewall_proposal.rb b/src/clients/firewall_proposal.rb
diff --git a/src/lib/y2firewall/clients/auto.rb b/src/lib/y2firewall/clients/auto.rb
@@ -20,7 +20,7 @@
 require "yast"
 require "y2firewall/firewalld"
 require "y2firewall/autoyast"
-require "y2firewall/proposal_settings"
+require "installation/security_settings"
 require "y2firewall/summary_presenter"
 require "y2firewall/dialogs/main"
 require "y2firewall/autoinst_profile/firewall_section"
@@ -235,9 +235,9 @@ def firewalld
         Firewalld.instance
       end
 
-      # @return [Y2Firewall::ProposalSettings]
+      # @return [::Installation::SecuritySettings]
       def settings
-        ProposalSettings.instance
+        ::Installation::SecuritySettings.instance
       end
 
       # Set that the firewall has to be enabled when writing

diff --git a/src/lib/y2firewall/clients/installation_finish.rb b/src/lib/y2firewall/clients/installation_finish.rb