From c242ddc2eb230c198eabc44d94f25d953c6f23e9 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 10 Aug 2018 15:17:43 +0100
Subject: [PATCH] Simple usb backups which don't use cryptfs
---
src/freedombone-backup-local | 7 ++++++-
src/freedombone-restore-local | 7 ++++++-
src/freedombone-utils-backup | 7 +++++--
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/freedombone-backup-local b/src/freedombone-backup-local
index 923d0707d..4a6398b17 100755
--- a/src/freedombone-backup-local
+++ b/src/freedombone-backup-local
@@ -375,7 +375,12 @@ remove_option="$2"
if [[ "$backup_device" == "remove" ]]; then
remove_option=$1
fi
-if [[ "$backup_device" == "detect" || "$backup_device" == "auto"* ]]; then
+simple_backup=
+if [[ "$backup_device" == "simple" || "$backup_device" == "detect" || "$backup_device" == "auto"* ]]; then
+ if [[ "$backup_device" == "simple" ]]; then
+ # shellcheck disable=SC2034
+ simple_backup=1
+ fi
backup_device=$(detect_connected_drives)
if [[ "$backup_device" != 'sd'* ]]; then
echo $'No backup device was detected'
diff --git a/src/freedombone-restore-local b/src/freedombone-restore-local
index fc0ff0574..b55fbfc48 100755
--- a/src/freedombone-restore-local
+++ b/src/freedombone-restore-local
@@ -967,7 +967,12 @@ function get_restore_app {
backup_device="$1"
-if [[ "$backup_device" == "detect" || "$backup_device" == "auto"* ]]; then
+simple_backup=
+if [[ "$backup_device" == "simple" || "$backup_device" == "detect" || "$backup_device" == "auto"* ]]; then
+ if [[ "$backup_device" == "simple" ]]; then
+ # shellcheck disable=SC2034
+ simple_backup=1
+ fi
backup_device=$(detect_connected_drives)
if [[ "$backup_device" != 'sd'* ]]; then
echo $'No backup device was detected'
diff --git a/src/freedombone-utils-backup b/src/freedombone-utils-backup
index 1f468c69c..70620e599 100755
--- a/src/freedombone-utils-backup
+++ b/src/freedombone-utils-backup
@@ -181,8 +181,11 @@ function backup_mount_drive {
cryptsetup close encrypted_usb
# mount the encrypted backup drive
- if cryptsetup open --type luks "$USB_DRIVE" encrypted_usb; then
- USB_DRIVE=/dev/mapper/encrypted_usb
+ # shellcheck disable=SC2154,SC2086
+ if [ ! $simple_backup ]; then
+ if cryptsetup open --type luks "$USB_DRIVE" encrypted_usb; then
+ USB_DRIVE=/dev/mapper/encrypted_usb
+ fi
fi
if ! mount "$USB_DRIVE" "$USB_MOUNT"; then
echo $"There was a problem mounting the USB drive to $USB_MOUNT"
--
GitLab