瀏覽代碼

Importing from keydrive

Bob Mottram 7 年之前
父節點
當前提交
b5f6a554f3
共有 1 個檔案被更改,包括 2 行新增2 行删除
  1. 2
    2
      src/freedombone-utils-keys

+ 2
- 2
src/freedombone-utils-keys 查看文件

@@ -122,8 +122,8 @@ function interactive_gpg_from_usb {
122 122
         if [ -f $USB_MOUNT/.mastergpgkey && -f $USB_MOUNT/.backupgpgkey ]; then
123 123
             # Recovering keys from file rather than just copying the gnupg
124 124
             # directory may help to avoid problems during upgrades/reinstalls
125
-            su -c "gpg --allow-secret-key-import --import $USB_MOUNT/.mastergpgkey" - $MY_USERNAME
126
-            su -c "gpg --allow-secret-key-import --import $USB_MOUNT/.backupgpgkey" - $MY_USERNAME
125
+            gpg --homedir=/home/$MY_USERNAME/.gnupg --allow-secret-key-import --import $USB_MOUNT/.mastergpgkey
126
+            echo "$BACKUP_DUMMY_PASSWORD" | gpg --batch --passphrase-fd 0 --homedir=/home/$MY_USERNAME/.gnupg --allow-secret-key-import --import $USB_MOUNT/.backupgpgkey
127 127
             if [ -d /home/$MY_USERNAME/.gnupg ]; then
128 128
                 chmod 700 /home/$MY_USERNAME/.gnupg
129 129
                 chmod -R 600 /home/$MY_USERNAME/.gnupg/*