소스 검색

Use agent during verification

Bob Mottram 7 년 전
부모
커밋
c9a92fd4f7
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2
    2
      src/freedombone-utils-backup

+ 2
- 2
src/freedombone-utils-backup 파일 보기

@@ -296,7 +296,7 @@ function backup_directory_to_usb_duplicity {
296 296
         exit 8352925
297 297
     fi
298 298
     if [[ $ENABLE_BACKUP_VERIFICATION == "yes" ]]; then
299
-        echo "$BACKUP_DUMMY_PASSWORD" | duplicity verify --gpg-options "$BACKUP_GPG_OPTIONS" --tempdir $BACKUP_TEMP_DIRECTORY --encrypt-key $MY_BACKUP_KEY_ID --full-if-older-than 4W --exclude-other-filesystems ${1} file://$USB_MOUNT/backup/${2}
299
+        echo "$BACKUP_DUMMY_PASSWORD" | duplicity verify --use-agent --gpg-options "$BACKUP_GPG_OPTIONS" --tempdir $BACKUP_TEMP_DIRECTORY --encrypt-key $MY_BACKUP_KEY_ID --full-if-older-than 4W --exclude-other-filesystems ${1} file://$USB_MOUNT/backup/${2}
300 300
         if [ ! "$?" = "0" ]; then
301 301
             umount $USB_MOUNT
302 302
             rm -rf $USB_MOUNT
@@ -424,7 +424,7 @@ function backup_directory_to_friend_duplicity {
424 424
         exit 5293526
425 425
     fi
426 426
     if [[ $ENABLE_BACKUP_VERIFICATION == "yes" ]]; then
427
-        echo "$BACKUP_DUMMY_PASSWORD" | duplicity verify --gpg-options "$BACKUP_GPG_OPTIONS" --tempdir $BACKUP_TEMP_DIRECTORY --ssh-askpass --encrypt-key ${ADMIN_BACKUP_KEY_ID} --full-if-older-than 4W --exclude-other-filesystems ${1} $SERVER_DIRECTORY/backup/${2}
427
+        echo "$BACKUP_DUMMY_PASSWORD" | duplicity verify --use-agent --gpg-options "$BACKUP_GPG_OPTIONS" --tempdir $BACKUP_TEMP_DIRECTORY --ssh-askpass --encrypt-key ${ADMIN_BACKUP_KEY_ID} --full-if-older-than 4W --exclude-other-filesystems ${1} $SERVER_DIRECTORY/backup/${2}
428 428
         if [ ! "$?" = "0" ]; then
429 429
             if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
430 430
                 shred -zu ${1}/*