--- a/bin/update	Thu Feb 26 23:04:19 2015 +0200
+++ b/bin/update	Thu Feb 26 23:20:37 2015 +0200
@@ -9,13 +9,14 @@
 
 . $LIB/pvl/main.sh
 
-MODULES=(log commit apply update)
+MODULES=(log commit apply service update)
 MODULE=update
 
 . $LIB/pvl/commit.sh
 . $LIB/pvl/apply.sh
+. $LIB/pvl/service.sh
+
 . $LIB/pvl/test.sh
-
 . $LIB/pvl/hosts/update.sh
 
 main "$@"

--- a/lib/pvl/commit.sh	Thu Feb 26 23:04:19 2015 +0200
+++ b/lib/pvl/commit.sh	Thu Feb 26 23:20:37 2015 +0200
@@ -68,22 +68,22 @@
 
     # operate?
     if [ "$COMMIT" = 1 ]; then
-        log_force   "$repo: force commit"
+        log_force "$repo: force commit"
 
         [ "$COMMIT_DIFF" ] && cmd_indent "    " ${commit}_diff "$repo" || true
 
         ${commit}_commit "$repo" "$commit_msg"
 
     elif ! ${commit}_modified "$repo"; then
-        log_warn    "$repo: no changes to commit"
+        log_skip "$repo: no changes to commit"
 
     elif [ "$COMMIT" = 0 ]; then
-        log_noop    "$repo: skip commit"
+        log_noop "$repo: skip commit"
         
         # still show diff, though
         [ "$COMMIT_DIFF" ] && cmd_indent "    " ${commit}_diff "$repo" || true
     else
-        log_apply   "$repo: commit: $commit_msg"
+        log_apply "$repo: commit: $commit_msg"
 
         [ "$COMMIT_DIFF" ] && cmd_indent "    " ${commit}_diff "$repo" || true
 

--- a/lib/pvl/hosts/dhcp.sh	Thu Feb 26 23:04:19 2015 +0200
+++ b/lib/pvl/hosts/dhcp.sh	Thu Feb 26 23:20:37 2015 +0200
@@ -1,6 +1,6 @@
-DHCPD=/usr/sbin/dhcpd
-DHCPD_CONF=/etc/dhcp/dhcpd.conf
-DHCP_SERVER=isc-dhcp-server
+DHCP_SBIN=/usr/sbin/dhcpd
+DHCP_CONF=/etc/dhcp/dhcpd.conf
+DHCP_SERVICE=isc-dhcp-server
 
 ## Generate DHCP hosts config from hosts hosts using pvl.hosts-dhcp
 #
@@ -48,7 +48,7 @@
 function test_dhcp {
     local conf="$1"
 
-    if [ ! -e "$DHCPD" ]; then
+    if [ ! -e "$DHCP_SBIN" ]; then
         log_warn "check_dhcp: dhcpd not installed, skipping: $conf"
         return 0
     fi
@@ -56,7 +56,7 @@
     log_check "Checking DHCP: $conf" 
 
     test_cmd "$conf" \
-        "$DHCPD" -cf "$conf" -t
+        "$DHCP_SBIN" -cf "$conf" -t
 }
 
 ## Reload dhcp hosts
@@ -73,16 +73,16 @@
 
         return
  
-    elif [ ! -e "$DHCPD" ]; then
+    elif [ ! -e "$DHCP_SBIN" ]; then
         warn "Skip missing DHCP"
 
         return 
    
-    elif test_dhcp "$DHCP_CONF"; then
+    elif ! test_dhcp "$DHCP_CONF"; then
         log_error "Skip config error DHCP"
 
-    elif ! cmd_test service $DHCP_SERVICE status >/dev/null; then
-        log_warn "dhcpd not running; did not restart"
+    elif ! service_status $DHCP_SERVICE; then
+        log_skip "dhcpd not running; did not restart"
 
         return
 
@@ -90,5 +90,5 @@
         log_apply "Reload DHCP"
     fi
 
-    cmd service $DHCP_SERVICE restart
+    service_restart $DHCP_SERVICE
 }

--- a/lib/pvl/hosts/update.sh	Thu Feb 26 23:04:19 2015 +0200
+++ b/lib/pvl/hosts/update.sh	Thu Feb 26 23:20:37 2015 +0200
@@ -67,7 +67,7 @@
         log_warn "Using local unix time for uncommited changes: $serial"
     else
         serial=$(commit_time $SRV)
-        log_apply "Using commit timestamp: $serial"
+        log "Using commit timestamp: $serial"
     fi
 
     ## Hosts
@@ -116,17 +116,16 @@
         test_zone "var/zones/$zone" $zone
     done
 
-    log "Testing DHCP confs..."
+    log "Reload zones..."
+        reload_zones
+
+    log "Testing DHCP..."
     for conf in $(list_files var/dhcp); do
         test_dhcp "var/dhcp/$conf"
     done
 
-    log "Reload zones..."
-        reload_zones
-
-    log "Reload dhcp..."
+    log "Reload DHCP..."
         reload_dhcp
-
 }
 
 ## Main entry point

--- a/lib/pvl/hosts/zone.sh	Thu Feb 26 23:04:19 2015 +0200
+++ b/lib/pvl/hosts/zone.sh	Thu Feb 26 23:20:37 2015 +0200
@@ -208,7 +208,7 @@
         log_apply "Reload zones"
     fi
 
-    indent "        rndc: " \
+    cmd_indent "        rndc: " \
         $RNDC reload
 
     # set flag for dhcp

--- a/lib/pvl/log.sh	Thu Feb 26 23:04:19 2015 +0200
+++ b/lib/pvl/log.sh	Thu Feb 26 23:20:37 2015 +0200
@@ -7,6 +7,7 @@
 LOG_WARN=y
 LOG_FORCE=y
 LOG_APPLY=y
+LOG_CHECK=
 LOG_NOOP=y
 LOG_SKIP=
 LOG_DEBUG=
@@ -39,8 +40,10 @@
             LOG_NOOP=
             LOG_DIFF=
             ;;
-
-        v)  LOG_SKIP=y ;;
+        v)  
+            LOG_CHECK=y
+            LOG_SKIP=y
+            ;;
         D)  
             LOG_DEBUG=y
             LOG_INFO=y
@@ -95,7 +98,7 @@
 }
 
 function log_check {
-    [ $LOG_APPLY    ] && log_color '37'     "  $*"          || true
+    [ $LOG_CHECK    ] && log_color '32'     "  $*"          || true
 }
 
 function log_noop {
@@ -107,7 +110,7 @@
 }
 
 function log_debug {
-    [ $LOG_DEBUG    ] && log_color '32'     "    $*"        || true
+    [ $LOG_DEBUG    ] && log_color '34'     "    $*"        || true
 }
 
 function log_cmd {