diff -Nur -x '*.orig' -x '*.rej' smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/defaults/rdiff-backup/BackupPath mezzanine_patched_smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/defaults/rdiff-backup/BackupPath --- smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/defaults/rdiff-backup/BackupPath 2006-05-18 12:59:50.364723614 +1000 +++ mezzanine_patched_smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/defaults/rdiff-backup/BackupPath 1970-01-01 10:00:00.000000000 +1000 @@ -1 +0,0 @@ -/media/usbdisk/rdiff-backup diff -Nur -x '*.orig' -x '*.rej' smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/defaults/rdiff-backup/LocalPath mezzanine_patched_smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/defaults/rdiff-backup/LocalPath --- smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/defaults/rdiff-backup/LocalPath 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/LocalPath 2006-05-18 12:55:22.464320237 +1000 @@ -0,0 +1 @@ +/media/usbdisk/rdiff-backup diff -Nur -x '*.orig' -x '*.rej' smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/defaults/rdiff-backup/RemoteIdentity mezzanine_patched_smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/defaults/rdiff-backup/RemoteIdentity --- smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/defaults/rdiff-backup/RemoteIdentity 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/RemoteIdentity 2006-05-18 12:58:43.503352312 +1000 @@ -0,0 +1 @@ +/root/.ssh/id_rsa_rdiff-backup diff -Nur -x '*.orig' -x '*.rej' smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/migrate/rdiff-backup mezzanine_patched_smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/migrate/rdiff-backup --- smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/migrate/rdiff-backup 1970-01-01 10:00:00.000000000 +1000 +++ mezzanine_patched_smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/migrate/rdiff-backup 2006-05-18 12:56:51.492834452 +1000 @@ -0,0 +1,7 @@ +{ + my $backup_path = $DB->get_prop_and_delete('rdiff-backup', 'BackupPath'); + + return unless $backup_path; + + $DB->set_prop('rdiff-backup', 'LocalPath', $backup_path); +} 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 12:59:50.367723092 +1000 +++ mezzanine_patched_smeserver-rdiff-backup-0.0.1/root/sbin/e-smith/do_rdiff-backup 2006-05-18 12:57:45.415455463 +1000 @@ -33,15 +33,15 @@ if [ $(/sbin/e-smith/config getprop rdiff-backup EnableLocal) = 'yes' ] then - BACKUP_PATH=$(/sbin/e-smith/config getprop rdiff-backup BackupPath) + LOCAL_PATH=$(/sbin/e-smith/config getprop rdiff-backup LocalPath) - if [ ! -d $BACKUP_PATH ] + if [ ! -d $LOCAL_PATH ] then - echo "$BACKUP_PATH does not exist - is it mounted?" + echo "$LOCAL_PATH does not exist - is it mounted?" exit 2 fi - $RDIFF_BACKUP $OPTIONS / $BACKUP_PATH/$ID || exit 3 + $RDIFF_BACKUP $OPTIONS / $LOCAL_PATH/$ID || exit 3 fi if [ $(/sbin/e-smith/config getprop rdiff-backup EnableRemote) = 'yes' ]