Browse Source

Include the option to format the drive during password export

Bob Mottram 8 years ago
parent
commit
d57e05f2f9
1 changed files with 12 additions and 4 deletions
  1. 12
    4
      src/freedombone-sec

+ 12
- 4
src/freedombone-sec View File

@@ -74,17 +74,25 @@ function export_passwords {
74 74
     data=$(tempfile 2>/dev/null)
75 75
     trap "rm -f $data" 0 1 2 5 15
76 76
     dialog --title $"Export passwords to USB drive $USB_DRIVE" \
77
-           --backtitle $"Freedombone Control Panel" \
77
+           --backtitle $"Security Settings" \
78 78
            --defaultno \
79
-           --yesno $"\nPlease confirm that you wish to export passwords to a LUKS formatted USB drive." 10 60
79
+           --yesno $"\nPlease confirm that you wish to export passwords to a LUKS formatted USB drive. The drive should be plugged in." 10 60
80 80
     sel=$?
81 81
     case $sel in
82 82
         1) return;;
83 83
         255) return;;
84 84
     esac
85 85
 
86
-    dialog --title $"Export passwords" \
87
-           --msgbox $"\nEnsure that the USB drive is plugged in then press Enter and type in the drive's encryption password" 8 60
86
+    data=$(tempfile 2>/dev/null)
87
+    trap "rm -f $data" 0 1 2 5 15
88
+    dialog --title $"Export passwords to USB drive $USB_DRIVE" \
89
+           --backtitle $"Security Settings" \
90
+           --defaultno \
91
+           --yesno $"\nDo you need to format the drive as LUKS encrypted?" 12 60
92
+    sel=$?
93
+    case $sel in
94
+        0) ${PROJECT_NAME}-format $USB_DRIVE;;
95
+    esac
88 96
 
89 97
     clear
90 98
     backup_mount_drive ${USB_DRIVE}