reloading named.service

yast · May 30, 2018 · 5a24ec3 · 5a24ec3
1 parent 8d2c917
commit 5a24ec3
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/package/yast2-dns-server.changes b/package/yast2-dns-server.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed May 30 09:45:34 CEST 2018 - schubi@suse.de
+
+- Reload named.service only if it is running, otherwise restart it.
+  (bnc#1093029)
+- 4.0.2
+
 -------------------------------------------------------------------
 Thu Jan 25 15:26:18 UTC 2018 - knut.anderssen@suse.com
 

diff --git a/package/yast2-dns-server.spec b/package/yast2-dns-server.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-dns-server
-Version:        4.0.1
+Version:        4.0.2
 Release:        0
 Url:            https://github.com/yast/yast-dns-server
 

diff --git a/src/include/dns-server/dialog-main.rb b/src/include/dns-server/dialog-main.rb
@@ -1881,7 +1881,13 @@ def WriteDialog
       Wizard.RestoreHelp(Ops.get_string(@HELPS, "write", ""))
       ret = DnsServer.Write
       if ret
-        service.reload if status_widget.reload_flag?
+        if status_widget.reload_flag?
+          if service.running?
+            service.restart
+          else
+            service.restart
+          end
+        end
         :next
       else
         if Popup.YesNo(_("Saving the configuration failed. Change the settings?"))
@@ -1898,7 +1904,13 @@ def SaveAndRestart
       Wizard.RestoreHelp(Ops.get_string(@HELPS, "write", ""))
       ret = DnsServer.Write
       if ret
-        service.reload if status_widget.reload_flag?
+        if status_widget.reload_flag?
+          if service.running?
+            service.reload
+          else
+            service.restart
+          end
+        end
       else
         Report.Error(_("Saving the configuration failed"))
       end