--- a/bin/update	Fri Mar 16 15:25:31 2012 +0200
+++ b/bin/update	Fri Mar 16 15:37:13 2012 +0200
@@ -272,16 +272,17 @@
 }
 
 ## actions
-function update_serial {
-    local serial=$1; shift
+function update_zone_serial {
+    local name=$1; shift
+    local file=$SERIALS/$name.serial
     
-    local old=$(test -e $serial && cat $serial || echo '')
+    local old=$(test -e $file && cat $file || echo '')
 
-    log_info "Updating serial: $serial"
+    log_info "Updating $file..."
 
-    cmd $UPDATE_SERIAL $* $serial
+    cmd $UPDATE_SERIAL $* $file
     
-    local new=$(cat $serial)
+    local new=$(cat $file)
         
     log_debug "  $old -> $new"
 }
@@ -296,11 +297,11 @@
 
 
     if check_update $dst $src; then
-        log_info "Copying zone $zone.$part..."
+        log_info "Copying zones/$name..."
 
         do_update $dst cat $src
     else
-        log_info "Copying zone $zone.$part: not changed"
+        log_info "Copying zones/$name: not changed"
     fi
 }
 
@@ -314,14 +315,14 @@
     local serial=$SERIALS/$zone.serial
 
     if check_update $out $in $serial; then
-        log_info "Generating $zone zone headers..." 
+        log_info "Generating $out..." 
 
         do_update $out \
             $EXPAND_ZONE $SETTINGS/$zone.zone   \
                 --serial $SERIALS/$zone.serial  \
                 --expand zones=$ROOT/$ZONES
     else
-        log_info "Generating $zone zone headers: not changed" 
+        log_info "Generating $out: not changed" 
     fi
 }
 
@@ -336,7 +337,7 @@
     local serial=$SERIALS/$zone.serial
 
     if check_update $out $in $serial; then
-        log_info "Generating $zone:$view zone headers..."
+        log_info "Generating $out..."
 
         do_update $out \
             $EXPAND_ZONE $SETTINGS/$zone.zone   \
@@ -344,7 +345,7 @@
                 --expand zones=$ROOT/$ZONES     \
                 --expand view=$view
     else
-        log_info "Generating $zone:$view zone headers: not changed"
+        log_info "Generating $out: not changed"
     fi
 }
 
@@ -422,8 +423,8 @@
     if [ $SERIAL_NOUPDATE ]; then
         log_info "Skipped"
     else
-        update_serial   $SERIALS/paivola.serial
-        update_serial   $SERIALS/paivola-reverse.serial
+        update_zone_serial  paivola
+        update_zone_serial  paivola-reverse
     fi