From a115eead97eb8c443142f842299bd4fa2845f25f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com> Date: Tue, 24 Sep 2013 10:26:43 +0200 Subject: [PATCH] KVM SR: Resiliency: Don't stop import if destination file does not exist. Reverts part of be3b061 --- software/kvm/common.cfg | 2 +- software/kvm/template/kvm-import.sh.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/software/kvm/common.cfg b/software/kvm/common.cfg index 6995dbb67..a433527a8 100644 --- a/software/kvm/common.cfg +++ b/software/kvm/common.cfg @@ -117,7 +117,7 @@ mode = 0644 recipe = hexagonit.recipe.download url = ${:_profile_base_location_}/template/kvm-import.sh.in filename = kvm-import.sh.in -md5sum = a731372420dc59c0b5ba7bc5f39a14ad +md5sum = e03ed049cddd8d157228b09e1ebc071a download-only = true mode = 0755 diff --git a/software/kvm/template/kvm-import.sh.in b/software/kvm/template/kvm-import.sh.in index 66737bf33..9c1a9b096 100644 --- a/software/kvm/template/kvm-import.sh.in +++ b/software/kvm/template/kvm-import.sh.in @@ -3,5 +3,5 @@ DISK_PATH=${:disk-path} BACKUP_PATH=${:backup-disk-path} # TODO: Use rdiff -rm $DISK_PATH && \ +rm $DISK_PATH cp $BACKUP_PATH $DISK_PATH -- 2.30.9