diff --git a/remote-backup b/remote-backup index 5390260..97a4746 100755 --- a/remote-backup +++ b/remote-backup @@ -65,7 +65,7 @@ do source /etc/remote-backup/defaults.conf source "$config" - echo "Debut de backup de ${REMOTE_LOCATION} vers ${SNAPSHOT_RW}/${DEST}/ a $(date)" + echo "Debut de backup de ${REMOTE_LOCATION} vers ${SNAPSHOT_RW}/${NAME}/ a $(date)" # ------------- the script itself -------------------------------------- @@ -90,26 +90,26 @@ do # rotating snapshots of /home (fixme: this should be more general) # step 1: delete the oldest snapshot, if it exists: - if [ -d $SNAPSHOT_RW/$DEST/daily.${MAX_ROTATE} ] + if [ -d $SNAPSHOT_RW/$NAME/daily.${MAX_ROTATE} ] then - $RM -rf $SNAPSHOT_RW/$DEST/daily.${MAX_ROTATE} + $RM -rf $SNAPSHOT_RW/$NAME/daily.${MAX_ROTATE} fi # step 2: shift the middle snapshots(s) back by one, if they exist for backup_number in $(seq $((${MAX_ROTATE}-1)) -1 1) do - if [ -d $SNAPSHOT_RW/$DEST/daily.${backup_number} ] + if [ -d $SNAPSHOT_RW/$NAME/daily.${backup_number} ] then - $MV $SNAPSHOT_RW/$DEST/daily.${backup_number} \ - $SNAPSHOT_RW/$DEST/daily.$((${backup_number}+1)) + $MV $SNAPSHOT_RW/$NAME/daily.${backup_number} \ + $SNAPSHOT_RW/$NAME/daily.$((${backup_number}+1)) fi done # step 3: make a hard-link-only (except for dirs) copy of the latest snapshot, # if that exists - if [ -d $SNAPSHOT_RW/$DEST/daily.0 ] + if [ -d $SNAPSHOT_RW/$NAME/daily.0 ] then - $CP -al $SNAPSHOT_RW/$DEST/daily.0 $SNAPSHOT_RW/$DEST/daily.1 + $CP -al $SNAPSHOT_RW/$NAME/daily.0 $SNAPSHOT_RW/$NAME/daily.1 fi # step 4: rsync from the system into the latest snapshot (notice that @@ -123,10 +123,10 @@ do --exclude-from="$EXCLUDES" \ --bwlimit=$BWLIMIT \ ${REMOTE_LOCATION} \ - $SNAPSHOT_RW/$DEST/daily.0 + $SNAPSHOT_RW/$NAME/daily.0 # step 5: update the mtime of daily.0 to reflect the snapshot time - $TOUCH $SNAPSHOT_RW/$DEST/daily.0 + $TOUCH $SNAPSHOT_RW/$NAME/daily.0 # and thats it for home. @@ -141,6 +141,6 @@ do fi fi - echo "Fin de backup de ${REMOTE_LOCATION} vers ${SNAPSHOT_RW}/${DEST}/ a $(date)" + echo "Fin de backup de ${REMOTE_LOCATION} vers ${SNAPSHOT_RW}/${NAME}/ a $(date)" echo '-----------------------------------------------------------------------' done