openresolv/trunk/fs33801.patch

   1 diff -u -r openresolv-3.8.1/dnsmasq.in openresolv-3.8.1-arch/dnsmasq.in
   2 --- openresolv-3.8.1/dnsmasq.in 2016-05-19 12:36:35.000000000 +0200
   3 +++ openresolv-3.8.1-arch/dnsmasq.in    2016-05-19 20:05:19.659940747 +0200
   4 @@ -190,8 +190,8 @@
   5         fi
   6  fi
   7  if $dbus; then
   8 -       if [ -s "$dnsmasq_pid" ]; then
   9 -               $changed || kill -HUP $(cat "$dnsmasq_pid")
  10 +       if $changed && systemctl --quiet is-active dnsmasq; then
  11 +               systemctl reload dnsmasq
  12         fi
  13         # Send even if empty so old servers are cleared
  14         if $dbus_ex; then
  15 diff -u -r openresolv-3.8.1/unbound.in openresolv-3.8.1-arch/unbound.in
  16 --- openresolv-3.8.1/unbound.in 2016-05-19 12:36:35.000000000 +0200
  17 +++ openresolv-3.8.1-arch/unbound.in    2016-05-19 20:04:20.207722679 +0200
  18 @@ -86,12 +86,7 @@
  19         [ "$(cat "$unbound_conf")" != "$(printf %s "$newconf")" ]
  20  then
  21         printf %s "$newconf" >"$unbound_conf"
  22 -       # If we can't sent a HUP then force a restart
  23 -       if [ -s "$unbound_pid" ]; then
  24 -               if ! kill -HUP $(cat "$unbound_pid") 2>/dev/null; then
  25 -                       restart_unbound
  26 -               fi
  27 -       else
  28 -               restart_unbound
  29 +       if systemctl --quiet is-active unbound; then
  30 +               systemctl reload unbound
  31         fi
  32  fi