localsnar="${storagedir}/${computer}/${sfilesystem}/.incremental.snar"
remotesnar="$remotehome/.backup/${sfilesystem}.snar"
- if [ "$backuplevel" = "daglig" ]; then
+ if [ "$backuplevel" = "daily" ]; then
# If incremental backup, we need to copy the incremental status to $computer.
# If it does not exist, whine a bit and then run date-based instead.
if [ -s "$localsnar" ]; then
# a GPG command line.
storageprogram=$( findconf storageprogram $computer $sfilesystem )
+ # Find compressor and decompressor for this filesystem.
+ fscompressor=$( findconf compressor $computer $filesystem )
+ if [ -z "$fscompressor" ]; then
+ fscompressor=$compressor
+ fi
+ decompressor=$( findconf decompressor $computer $filesystem )
+
# We try to run tar on the remote computer
# c create archive
# C change to directory first
# Pipe the stuff over ssh to ourselves, run pee to cat the contents to a
# file and build a file list, respectivly.
TARFILE=$DATE.tmp
- TARCMD="ssh -n $username@$computer \"$nice tar --one-file-system --use-compress-program $compressor -cf - -C $filesystem . $lastcmd \
- --exclude-from=$remotehome/.backup/exclude\" | pee \"$storageprogram > $TARFILE\" \"tar tzvf -\""
+ TARCMD="ssh -n $username@$computer \"$nice tar --one-file-system --use-compress-program $fscompressor -cf - -C $filesystem . $lastcmd \
+ --exclude-from=$remotehome/.backup/exclude\" | pee \"$storageprogram > $TARFILE\" \"$decompressor | tar tvf -\""
infomsg "Running $TARCMD"
eval $TARCMD > $DATE.idx
{
infomsg "$computer:$filesystem $backuplevel non-privileged backup"
- if [ "$backuplevel" = "daglig" ]; then
+ if [ "$backuplevel" = "daily" ]; then
lastd=`cat ../.date`
lastcmd="'$lastd'"
else
diemsg "Could not expand ~ for user $username"
fi
-# Check if pigz is available
-if ssh -n $username@$computer "pigz -V 2>/dev/null"; then
- compressor=pigz
-else
- infomsg "pigz missing; falling back to gzip."
- compressor=gzip
+# Check if pigz is available. Note that this may be overridden per-filesystem later.
+compressor=$( findconf compressor $computer )
+if [ -z "$compressor" ]; then
+ if ssh -n $username@$computer "pigz -V 2>/dev/null"; then
+ compressor=pigz
+ else
+ infomsg "pigz missing; falling back to gzip."
+ compressor=gzip
+ fi
fi
# Check if nice and ionice are available
# Prepare storage area
mkdir -m 755 -p $storagedir/$computer/$sfilesystem/full 2>/dev/null
- mkdir -m 755 -p $storagedir/$computer/$sfilesystem/daglig 2>/dev/null
+ mkdir -m 755 -p $storagedir/$computer/$sfilesystem/daily 2>/dev/null
# Default backuplevel
- backuplevel=daglig
+ backuplevel=daily
if [ ! -s $storagedir/$computer/$sfilesystem/.date ]; then
# Take the first full backup of this filesystem on this computer
# Delete incremental backups older than the oldest full backup
oldf=`ls -t1 $storagedir/$computer/$sfilesystem/full/*tgz* | tail -1`
find \
- $storagedir/$computer/$sfilesystem/daglig \
+ $storagedir/$computer/$sfilesystem/daily \
-type f \
\! -newer $oldf \
-printf "`date`: $computer: Deleting old incremental backup: %p\n" \