From 036cbad80af8767ad56ca4db385249489650481c Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Mon, 24 Oct 2016 21:53:14 +0100
Subject: [PATCH] Check if database password file exists
---
src/freedombone-restore-local | 5 ++++-
src/freedombone-restore-remote | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/freedombone-restore-local b/src/freedombone-restore-local
index f64f320fe..8f4caab31 100755
--- a/src/freedombone-restore-local
+++ b/src/freedombone-restore-local
@@ -66,7 +66,10 @@ if [ -f $COMPLETION_FILE ]; then
fi
# MariaDB password
-DATABASE_PASSWORD=$(cat /root/dbpass)
+DATABASE_PASSWORD=''
+if [ -f /root/dbpass ]; then
+ DATABASE_PASSWORD=$(cat /root/dbpass)
+fi
function check_backup_exists {
if [ ! -d $USB_MOUNT/backup ]; then
diff --git a/src/freedombone-restore-remote b/src/freedombone-restore-remote
index d8ae33e21..29e51e729 100755
--- a/src/freedombone-restore-remote
+++ b/src/freedombone-restore-remote
@@ -94,7 +94,10 @@ else
fi
# MariaDB password
-DATABASE_PASSWORD=$(cat /root/dbpass)
+DATABASE_PASSWORD=''
+if [ -f /root/dbpass ]; then
+ DATABASE_PASSWORD=$(cat /root/dbpass)
+fi
function copy_gpg_keys {
echo $"Copying GPG keys from admin user to root"
--
GitLab