瀏覽代碼

Detect drive first

Bob Mottram 8 年之前
父節點
當前提交
cee929e7a4
共有 1 個檔案被更改,包括 6 行新增6 行删除
  1. 6
    6
      src/freedombone-config

+ 6
- 6
src/freedombone-config 查看文件

964
     GPG_CTR=0
964
     GPG_CTR=0
965
     while [[ $GPG_LOADING == "yes" ]]
965
     while [[ $GPG_LOADING == "yes" ]]
966
     do
966
     do
967
-        if [ ! -b $GPG_USB_DRIVE ]; then
967
+        detect_usb_drive
968
+
969
+        if [ ! -b $USB_DRIVE ]; then
968
             if (( GPG_CTR > 0 )); then
970
             if (( GPG_CTR > 0 )); then
969
                 reconstruct_key
971
                 reconstruct_key
970
                 return 0
972
                 return 0
973
             exit 739836
975
             exit 739836
974
         fi
976
         fi
975
 
977
 
976
-        detect_usb_drive
977
-        GPG_USB_DRIVE=$USB_DRIVE
978
         GPG_USB_MOUNT='/mnt/usb'
978
         GPG_USB_MOUNT='/mnt/usb'
979
         umount -f $GPG_USB_MOUNT
979
         umount -f $GPG_USB_MOUNT
980
         if [ ! -d $GPG_USB_MOUNT ]; then
980
         if [ ! -d $GPG_USB_MOUNT ]; then
985
             rm -rf /dev/mapper/encrypted_usb
985
             rm -rf /dev/mapper/encrypted_usb
986
         fi
986
         fi
987
         cryptsetup luksClose encrypted_usb
987
         cryptsetup luksClose encrypted_usb
988
-        cryptsetup luksOpen $GPG_USB_DRIVE encrypted_usb
988
+        cryptsetup luksOpen $USB_DRIVE encrypted_usb
989
         if [ "$?" = "0" ]; then
989
         if [ "$?" = "0" ]; then
990
-            GPG_USB_DRIVE=/dev/mapper/encrypted_usb
990
+            USB_DRIVE=/dev/mapper/encrypted_usb
991
         fi
991
         fi
992
-        mount $GPG_USB_DRIVE $GPG_USB_MOUNT
992
+        mount $USB_DRIVE $GPG_USB_MOUNT
993
         if [ ! "$?" = "0" ]; then
993
         if [ ! "$?" = "0" ]; then
994
             if (( GPG_CTR > 0 )); then
994
             if (( GPG_CTR > 0 )); then
995
                 rm -rf $GPG_USB_MOUNT
995
                 rm -rf $GPG_USB_MOUNT