diff -Nur -x '*.orig' -x '*.rej' smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/defaults/rdiff-backup/RemoveOlderThan mezzanine_patched_smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/defaults/rdiff-backup/RemoveOlderThan --- smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/defaults/rdiff-backup/RemoveOlderThan 1970-01-01 10:00:00.000000000 +1000 +++ mezzanine_patched_smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/defaults/rdiff-backup/RemoveOlderThan 2006-05-18 13:24:54.954274229 +1000 @@ -0,0 +1 @@ +6W diff -Nur -x '*.orig' -x '*.rej' smeserver-rdiff-backup-0.0.1/root/sbin/e-smith/do_rdiff-backup mezzanine_patched_smeserver-rdiff-backup-0.0.1/root/sbin/e-smith/do_rdiff-backup --- smeserver-rdiff-backup-0.0.1/root/sbin/e-smith/do_rdiff-backup 2006-05-18 13:38:50.105480262 +1000 +++ mezzanine_patched_smeserver-rdiff-backup-0.0.1/root/sbin/e-smith/do_rdiff-backup 2006-05-18 13:38:09.014603428 +1000 @@ -26,9 +26,12 @@ RDIFF_BACKUP="/usr/bin/rdiff-backup" OPTIONS="--include-globbing-filelist /etc/rdiff-backup.filelist" + OPTIONS="$OPTIONS --exclude /" OPTIONS="$OPTIONS $FORCE" +REMOVE_OLDER="--remove-older-than $(/sbin/e-smith/config getprop rdiff-backup RemoveOlderThan) --force" + /sbin/e-smith/signal-event pre-backup || exit 1 if [ $(/sbin/e-smith/config getprop rdiff-backup EnableLocal) = 'yes' ] @@ -42,6 +45,8 @@ fi $RDIFF_BACKUP $OPTIONS / $LOCAL_PATH/$ID || exit 3 + + $RDIFF_BACKUP $REMOVE_OLDER $LOCAL_PATH/$ID || exit 4 fi if [ $(/sbin/e-smith/config getprop rdiff-backup EnableRemote) = 'yes' ] @@ -54,8 +59,10 @@ then echo "$0: Skipping remote backup to localhost" else - $RDIFF_BACKUP $OPTIONS / $REMOTE_HOST::$REMOTE_PATH/$ID || exit 4 + $RDIFF_BACKUP $OPTIONS / $REMOTE_HOST::$REMOTE_PATH/$ID || exit 5 + + $RDIFF_BACKUP $REMOVE_OLDER $REMOTE_HOST::$REMOTE_PATH/$ID || exit 6 fi fi -/sbin/e-smith/signal-event post-backup || exit 5 +/sbin/e-smith/signal-event post-backup || exit 7