Changeset 360

Timestamp:

11/26/08 18:45:57 (3 years ago)

Author:

tschmitt

Message:

linuxmuster-backup:

• minor improvements in handling incremental and differential backupsets
• backup device will be temporarily removed from fstab during backup

Location:

main/linuxmuster-base/trunk

Files:

• debian/changelog (modified) (1 diff)
• sbin/linuxmuster-backup (modified) (9 diffs)

main/linuxmuster-base/trunk/debian/changelog

@@ +1 @@
+linuxmuster-base (1.4.43-1) testing; urgency=low
+
+  * linuxmuster-backup:
+    - minor improvements in handling incremental and differential backupsets
+    - backup device will be temporarily removed from fstab during backup
+
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Wed, 26 Nov 2008 18:43:19 +0100
+
 linuxmuster-base (1.4.42-1) testing; urgency=low
 

main/linuxmuster-base/trunk/sbin/linuxmuster-backup

@@ -5 +5 @@
 # schmitt@lmz-bw.de
 #
-# 23.11.2008
+# 26.11.2008
 #
 
@@ -16 +16 @@
 . $HELPERFUNCTIONS || exit 1
 
-# default return code
-RC=0
 
 # default values
 mondocache=/var/cache/mondo
-difflevel="difflevel.0"
+cachefiles="difflevel.0"
 verify=yes
 isoprefix=server
@@ -170 +168 @@
 
     *)
-        error "Unknown restore method!"
+        echo "Unknown restore method!"
+        error
         ;;
 
@@ -207 +206 @@
 # shut down services
 if [ -n "$services" ]; then
-
         echo "Shutting down services ..."
-
         if [ "$services" = "all" ]; then
-
                 for s in `ls -r /etc/rc${rl}.d/S*`; do
-
                         $s stop
-
                 done
-        
         else
-
                 for s in $services; do
-
                         [ -e /etc/rc${rl}.d/S??${s} ] && echo /etc/rc${rl}.d/S??${s} >> $stmp
-
                 done
-
                 if [ -s "$stmp" ]; then
-
                         for s in `sort -r $stmp`; do
-
                                 $s stop
-
                         done
-
                 else
-
                         echo "No services to shut down!"
-
                 fi
-
-        fi
-
+        fi
 fi
 
@@ -270 +251 @@
 backuptime=`date +%s`
 
+RC=0
 
 # determine last backup set
 case $btype in
-
         diff)
                 # difflevel of last full backup
                 if sets=`ls -dr $mountpoint/$isoprefix/*-*_full`; then
-
                         lastset=`echo $sets | awk '{ print $1 }'`
                         echo "Found last full backup set in $lastset."
-                        
                 else
-
                         echo "Last full backup set not found!"
                         RC=1
-
                 fi
                 ;;
-
         inc)
                 # difflevel of last backup (full, diff or inc)
                 if sets=`ls -dr $mountpoint/$isoprefix/*-*_* | grep -G _[dfi][inu][cfl]`; then
-
                         lastset=`echo $sets | awk '{ print $1 }'`
                         echo "Found last backup set in $lastset."
-                        
                 else
-
                         echo "Last backup set not found!"
                         RC=1
-
                 fi
                 ;;
-
         *)
                 ;;
-
 esac
-
 
 # restore mondo-archive cache if no full backup
 if [ "$btype" != "full" ]; then
-
         if [ -d "$lastset/cache" ]; then
-
-                # test if difflevel file is present
-                if [ -s "$lastset/cache/$difflevel" ]; then
-
-                        echo "Restoring difflevel from $lastset/cache ..."
-                        cp -f $lastset/cache/$difflevel $mondocache/ || RC=1
-
+                # test if all cachefiles are present
+                echo "Testing cachefiles in $lastset/cache ..."
+                for i in $cachefiles; do
+                        [ -e "$lastset/cache/$i" ] || RC=1
+                done
+                if [ "$RC" -eq 0 ]; then
+                        echo "Restoring cache from $lastset/cache ..."
+                        rsync -a --delete $lastset/cache/ $mondocache/
                 else
-
-                        echo "$lastset/cache/$difflevel is missing!"
-                        echo "Cannot restore difflevel!"
-                        RC=1
-
+                        echo "At least one of $cachefiles is missing!"
+                        echo "Cannot restore cache!"
                 fi
-
         else
-
-                echo "Cache directory $lastset/cache does not exist! Cannot restore difflevel!"
+                echo "$lastset/cache does not exist! Cannot restore cache!"
                 RC=1
-
-        fi
-
+        fi
 fi
 
@@ -348 +310 @@
 
 
+# remove backupdevice from fstab
+if [ $RC -eq 0 ]; then
+        if grep -q ^$backupdevice /etc/fstab; then
+                echo "Removing backup device $backupdevice from /etc/fstab!"
+                fstabtmp=/var/tmp/fstab.$$
+                cp -f /etc/fstab $fstabtmp || RC=1
+                grep -v $backupdevice $fstabtmp > /etc/fstab || RC=1
+        fi
+fi
+
+
 # starting mondoarchive
 if [ $RC -eq 0 ]; then
@@ -355 +328 @@
 
 
+# restoring fstab
+if [ -n "$fstabtmp" -a -e "$fstabtmp" ]; then
+        echo "Restoring /etc/fstab!"
+        mv -f $fstabtmp /etc/fstab
+fi
+
+
 # if mondoarchive exits cleanly
 if [ "$RC" = "0" ]; then
@@ -360 +340 @@
         echo "mondoarchive finished successfully!"
 
-        # store difflevel
-        echo "Storing difflevel to $mountpoint/$isoprefix/$bfolder/cache ..."
-        cp -f $mondocache/$difflevel $mountpoint/$isoprefix/$bfolder/cache/
+        # store cache files
+        echo "Storing cache to $mountpoint/$isoprefix/$bfolder/cache ..."
+        rsync -a --delete $mondocache/ $mountpoint/$isoprefix/$bfolder/cache/
 
         case $btype in
@@ -387 +367 @@
                         setstokeep=$keepdiff
                         # store difflevel
-                        echo $backuptime > $mountpoint/$isoprefix/$bfolder/cache/$difflevel
+                        echo $backuptime > $mountpoint/$isoprefix/$bfolder/cache/difflevel.0
                         ;;
 
                 inc)
                         setstokeep=$keepinc
-                        echo $backuptime > $mountpoint/$isoprefix/$bfolder/cache/$difflevel
+                        echo $backuptime > $mountpoint/$isoprefix/$bfolder/cache/difflevel.0
                         ;;