mostly fixes for new error handling

[distro-setup] / mail-setup

diff --git a/mail-setup b/mail-setup
index 68478bec55a07860a6c86d82ec3cefaae97704c9..98d5c415ae931655f906570ba4bdbca7862d0fe2 100755 (executable)
--- a/mail-setup
+++ b/mail-setup
@@ -676,7 +676,7 @@ EOF
 server=/mail.iankelling.org/127.0.1.1
 EOF
     if systemctl is-active dnsmasq >/dev/null; then
-      m systemctl reload dnsmasq
+      m systemctl restart dnsmasq
       m nscd -i hosts
     fi
 
@@ -810,7 +810,7 @@ EOF
     echo | /a/exe/cedit mail /etc/dnsmasq-servers.conf || [[ $? == 1 ]]
     if systemctl is-active dnsmasq >/dev/null; then
       m nscd -i hosts
-      m systemctl reload dnsmasq
+      m systemctl restart dnsmasq # reload does not ensure new config is used
     fi
 
     m systemctl disable mailclean.timer &>/dev/null ||: