--- a/bin/update	Fri Mar 16 15:37:13 2012 +0200
+++ b/bin/update	Fri Mar 16 15:46:43 2012 +0200
@@ -173,11 +173,17 @@
 function indent () {
     local indent=$1; shift
 
+    log_cmd "$@"
+
     "$@" | (
         while read line; do
             echo "$indent$line"
         done
-    ) || exit $?
+    ) || return $?
+}
+
+function abspath () {
+    echo "$ROOT/$1"
 }
 
 ## test
@@ -320,7 +326,7 @@
         do_update $out \
             $EXPAND_ZONE $SETTINGS/$zone.zone   \
                 --serial $SERIALS/$zone.serial  \
-                --expand zones=$ROOT/$ZONES
+                --expand zones=$(abspath $ZONES)
     else
         log_info "Generating $out: not changed" 
     fi
@@ -342,7 +348,7 @@
         do_update $out \
             $EXPAND_ZONE $SETTINGS/$zone.zone   \
                 --serial $SERIALS/$zone.serial  \
-                --expand zones=$ROOT/$ZONES     \
+                --expand zones=$(abspath $ZONES)    \
                 --expand view=$view
     else
         log_info "Generating $out: not changed"
@@ -418,11 +424,13 @@
         update_zone_part    paivola         internal
         update_zone_part    paivola         external
 
-    log "Updating serials..."
 
     if [ $SERIAL_NOUPDATE ]; then
-        log_info "Skipped"
+        log "Updating serials: skipped"
+
     else
+        log "Updating serials..."
+
         update_zone_serial  paivola
         update_zone_serial  paivola-reverse
     fi