Drop SuSEfirewall2 completely

yast · Aug 28, 2018 · 3bab225 · 3bab225
1 parent cf1edad
commit 3bab225
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 474 deletions.
diff --git a/src/include/network/lan/address.rb b/src/include/network/lan/address.rb
@@ -55,7 +55,6 @@ def initialize_network_lan_address(include_target)
       Yast.import "ProductFeatures"
       Yast.import "Routing"
       Yast.import "String"
-      Yast.import "SuSEFirewall4Network"
       Yast.import "Wizard"
       Yast.import "NetworkService"
       Yast.import "Map"
@@ -1063,10 +1062,10 @@ def ValidateBootproto(_key, _event)
     end
 
     # Initialize value of firewall zone widget
-    # (disables it when SuSEFirewall is not installed)
+    # (disables it when firewalld is not installed)
     # @param _key [String] id of the widget
     def InitFwZone(_key)
-      if SuSEFirewall4Network.IsInstalled
+      if firewalld.installed?
         UI.ChangeWidget(
           Id("FWZONE"),
           :Value,

diff --git a/src/include/network/widgets.rb b/src/include/network/widgets.rb
@@ -248,14 +248,6 @@ def ipoib_mode_widget
       }
     end
 
-    def firewall_widget
-      if SuSEFirewall4Network.IsInstalled
-        SuSEFirewall4Network.FirewallZonesComboBoxItems
-      else
-        [["", _("Firewall is not installed.")]]
-      end
-    end
-
     def common_mtu_items
       [
         # translators: MTU value description (size in bytes, desc)

diff --git a/src/modules/SuSEFirewall4Network.rb b/src/modules/SuSEFirewall4Network.rb