From e973bce5e00c9e1e24c7985c7c0b95ca8980b5a5 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 25 Jun 2017 15:15:15 +0100
Subject: [PATCH] Return of the database password

---
 src/freedombone-restore-local | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/freedombone-restore-local b/src/freedombone-restore-local
index b6b0ad7b7..91b98a382 100755
--- a/src/freedombone-restore-local
+++ b/src/freedombone-restore-local
@@ -44,6 +44,9 @@ if [ -f /usr/bin/${PROJECT_NAME} ]; then
     PROJECT_INSTALL_DIR=/usr/bin
 fi
 
+# MariaDB password
+DATABASE_PASSWORD=$(${PROJECT_NAME}-pass -u root -a mariadb)
+
 function please_wait {
         local str width height length
 
@@ -230,6 +233,7 @@ function restore_mariadb {
             echo $"Ensure MariaDB handles authentication"
             MARIADB_PASSWORD=$(${PROJECT_NAME}-pass -u root -a mariadb)
             mariadb_fix_authentication
+            DATABASE_PASSWORD=$(${PROJECT_NAME}-pass -u root -a mariadb)
         fi
         rm -rf $temp_restore_dir
     fi
-- 
GitLab