From b5f6a554f34774bc9e1880bfe95ae8dc86f59ca0 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 23 Jun 2017 18:34:53 +0100
Subject: [PATCH] Importing from keydrive
---
src/freedombone-utils-keys | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/freedombone-utils-keys b/src/freedombone-utils-keys
index f74d81120..9d4a02fb4 100755
--- a/src/freedombone-utils-keys
+++ b/src/freedombone-utils-keys
@@ -122,8 +122,8 @@ function interactive_gpg_from_usb {
if [ -f $USB_MOUNT/.mastergpgkey && -f $USB_MOUNT/.backupgpgkey ]; then
# Recovering keys from file rather than just copying the gnupg
# directory may help to avoid problems during upgrades/reinstalls
- su -c "gpg --allow-secret-key-import --import $USB_MOUNT/.mastergpgkey" - $MY_USERNAME
- su -c "gpg --allow-secret-key-import --import $USB_MOUNT/.backupgpgkey" - $MY_USERNAME
+ gpg --homedir=/home/$MY_USERNAME/.gnupg --allow-secret-key-import --import $USB_MOUNT/.mastergpgkey
+ echo "$BACKUP_DUMMY_PASSWORD" | gpg --batch --passphrase-fd 0 --homedir=/home/$MY_USERNAME/.gnupg --allow-secret-key-import --import $USB_MOUNT/.backupgpgkey
if [ -d /home/$MY_USERNAME/.gnupg ]; then
chmod 700 /home/$MY_USERNAME/.gnupg
chmod -R 600 /home/$MY_USERNAME/.gnupg/*
--
GitLab