Pārlūkot izejas kodu

Try the next drive letter on failure

Bob Mottram 8 gadus atpakaļ
vecāks
revīzija
1592227f8c
1 mainītis faili ar 15 papildinājumiem un 6 dzēšanām
  1. 15
    6
      src/freedombone-recoverkey

+ 15
- 6
src/freedombone-recoverkey Parādīt failu

@@ -39,7 +39,7 @@ source $PROJECT_INSTALL_DIR/${PROJECT_NAME}-vars
39 39
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
40 40
 for f in $UTILS_FILES
41 41
 do
42
-  source $f
42
+    source $f
43 43
 done
44 44
 
45 45
 read_config_param USB_DRIVE
@@ -202,11 +202,20 @@ function interactive_gpg_from_usb {
202 202
                     reconstruct_key
203 203
                     return 0
204 204
                 fi
205
-                dialog --title $"Encryption keys" \
206
-                       --msgbox $"The directory $GPG_USB_MOUNT/.gnupg or $GPG_USB_MOUNT/.gnupg_fragments was not found" 6 70
207
-                umount -f $GPG_USB_MOUNT
208
-                rm -rf $GPG_USB_MOUNT
209
-                exit 723814
205
+                if [[ "$GPG_USB_DRIVE" == *"sda1" ]]; then
206
+                    GPG_USB_DRIVE=/dev/sdb1
207
+                    write_config_param USB_DRIVE "$GPG_USB_DRIVE"
208
+                    umount -f $GPG_USB_MOUNT
209
+                    rm -rf $GPG_USB_MOUNT
210
+                    ${PROJECT_NAME}-recoverkey -u "$MY_USERNAME" -d sdb
211
+                    exit 0
212
+                else
213
+                    dialog --title $"Encryption keys" \
214
+                           --msgbox $"The directory $GPG_USB_MOUNT/.gnupg or $GPG_USB_MOUNT/.gnupg_fragments was not found" 6 70
215
+                    umount -f $GPG_USB_MOUNT
216
+                    rm -rf $GPG_USB_MOUNT
217
+                    exit 723814
218
+                fi
210 219
             fi
211 220
         fi
212 221