Do a reload by default when running

yast · Jan 9, 2019 · 35d9f5a · 35d9f5a
1 parent 78c1beb
commit 35d9f5a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/src/lib/y2firewall/dialogs/main.rb b/src/lib/y2firewall/dialogs/main.rb
@@ -130,17 +130,6 @@ def swap_api
       # modifications
       def apply_changes
         return false if Yast::Mode.config
-        # Firewall settings will be written into the permanent configurations only.
-        # So the running firewalld service will not be changed. Even a reload does
-        # not help (see man pages). So the running firewalld service has to be
-        # restarted.
-        # Set a flag only. Restarting will be done by system_service.save.
-        if fw.modified? && # Data has been changed by user
-            fw.system_service.running? &&      # The service is already running
-            fw.system_service.action != :stop  # and will not be stopped by the user
-          fw.system_service.restart
-        end
-
         fw.write_only
         fw.system_service.save
       end

diff --git a/src/lib/y2firewall/widgets/pages/startup.rb b/src/lib/y2firewall/widgets/pages/startup.rb
@@ -34,6 +34,7 @@ class Startup < CWM::Page
         # @param _pager [CWM::TreePager]
         def initialize(_pager)
           textdomain "firewall"
+          system_service.reload if system_service.running?
         end
 
         # @macro seeAbstractWidget