From: Marcin Siodelski <marcin@isc.org>
Date: Wed, 22 Jul 2015 20:53:26 +0000 (+0200)
Subject: [master] Merge branch 'trac3785'
X-Git-Tag: trac4006_base~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a27d72ef3cb7640a41dca26c8728a9cbd9ad1ca9;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3785'
---

a27d72ef3cb7640a41dca26c8728a9cbd9ad1ca9
diff --cc src/bin/keactrl/keactrl.in
index 129a7e74e2,594459f040..5e422560e9
--- a/src/bin/keactrl/keactrl.in
+++ b/src/bin/keactrl/keactrl.in
@@@ -371,19 -307,23 +378,23 @@@ case ${command} i
  
      # Stop running servers.
      stop)
+         check_kea_conf ${kea_config_file}
+ 
          # Stop all servers or servers specified from the command line.
 -        run_conditional "dhcp4" "send_signal 15 $(basename ${dhcp4_srv})" 0
 -        run_conditional "dhcp6" "send_signal 15 $(basename ${dhcp6_srv})" 0
 -        run_conditional "dhcp_ddns" "send_signal 15 $(basename ${dhcp_ddns_srv})" 0
 +        run_conditional "dhcp4" "stop_server ${dhcp4_srv}" 0
 +        run_conditional "dhcp6" "stop_server ${dhcp6_srv}" 0
 +        run_conditional "dhcp_ddns" "stop_server ${dhcp_ddns_srv}" 0
  
          exit 0 ;;
  
      # Reconfigure the servers.
      reload)
+         check_kea_conf ${kea_config_file}
+ 
          # Reconfigure all servers or servers specified from the command line.
 -        run_conditional "dhcp4" "send_signal 1 $(basename ${dhcp4_srv})" 0
 -        run_conditional "dhcp6" "send_signal 1 $(basename ${dhcp6_srv})" 0
 -        run_conditional "dhcp_ddns" "send_signal 1 $(basename ${dhcp_ddns_srv})" 0
 +        run_conditional "dhcp4" "reload_server ${dhcp4_srv}" 0
 +        run_conditional "dhcp6" "reload_server ${dhcp6_srv}" 0
 +        run_conditional "dhcp_ddns" "reload_server ${dhcp_ddns_srv}" 0
  
          exit 0 ;;