Bläddra i källkod

Importing from keydrive

Bob Mottram 8 år sedan
förälder
incheckning
b5f6a554f3
1 ändrade filer med 2 tillägg och 2 borttagningar
  1. 2
    2
      src/freedombone-utils-keys

+ 2
- 2
src/freedombone-utils-keys Visa fil

122
         if [ -f $USB_MOUNT/.mastergpgkey && -f $USB_MOUNT/.backupgpgkey ]; then
122
         if [ -f $USB_MOUNT/.mastergpgkey && -f $USB_MOUNT/.backupgpgkey ]; then
123
             # Recovering keys from file rather than just copying the gnupg
123
             # Recovering keys from file rather than just copying the gnupg
124
             # directory may help to avoid problems during upgrades/reinstalls
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
             if [ -d /home/$MY_USERNAME/.gnupg ]; then
127
             if [ -d /home/$MY_USERNAME/.gnupg ]; then
128
                 chmod 700 /home/$MY_USERNAME/.gnupg
128
                 chmod 700 /home/$MY_USERNAME/.gnupg
129
                 chmod -R 600 /home/$MY_USERNAME/.gnupg/*
129
                 chmod -R 600 /home/$MY_USERNAME/.gnupg/*