# HG changeset patch
# User Tero Marttila <terom@paivola.fi>
# Date 1332426972 -7200
# Node ID 5a0335960591277883ddacbf66476fd6fe481d65
# Parent  e54d4407ed5bc39ae02451416b01639f80d003d8
update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed

diff -r e54d4407ed5b -r 5a0335960591 lib/update.operations
--- a/lib/update.operations	Thu Mar 22 16:30:54 2012 +0200
+++ b/lib/update.operations	Thu Mar 22 16:36:12 2012 +0200
@@ -294,6 +294,11 @@
 function check_dhcp {
     local conf=${1:-$DHCPD_CONF}
 
+    if [ ! -e $DHCPD ]; then
+        log_warn "check_dhcp: dhcpd not installed, skipping: $conf"
+        return 0
+    fi
+
     check_generic $conf \
         $DHCPD -cf $conf -t
 }
@@ -353,6 +358,12 @@
     elif [ $RELOAD_NOOP ]; then
         log_noop    "$msg: skipped"
     
+    elif [ ! -e $RNDC ]; then
+        log_warn "reload_zones: rndc not installed, skipping"
+
+    elif [ ! -e $RNDC_KEY ]; then
+        log_warn   "  $msg: rndc: key not found: $RNDC_KEY"
+
     elif [ ! -r $RNDC_KEY ]; then
         log_error   "  $msg: rndc: permission denied: $RNDC_KEY"
 
@@ -394,7 +405,10 @@
 
     elif [ $RELOAD_NOOP ]; then
         log_noop    "$msg: skipped"
-    
+ 
+    elif [ ! -e $DHCPD ]; then
+        log_warn "reload_dhcp: dhcpd not installed, skipping: $conf"
+   
     else
         log_update  "$msg..."