Pārlūkot izejas kodu

Mounting and unmounting the usb drive

Bob Mottram 8 gadus atpakaļ
vecāks
revīzija
750d83ffa8
1 mainītis faili ar 18 papildinājumiem un 34 dzēšanām
  1. 18
    34
      src/freedombone-utils-keys

+ 18
- 34
src/freedombone-utils-keys Parādīt failu

83
             exit 739836
83
             exit 739836
84
         fi
84
         fi
85
 
85
 
86
-        GPG_USB_MOUNT='/mnt/usb'
87
-        umount -f $GPG_USB_MOUNT
88
-        if [ ! -d $GPG_USB_MOUNT ]; then
89
-            mkdir -p $GPG_USB_MOUNT
90
-        fi
86
+        backup_mount_drive ${USB_DRIVE} ${MY_USERNAME}
91
 
87
 
92
-        if [ -f /dev/mapper/encrypted_usb ]; then
93
-            rm -rf /dev/mapper/encrypted_usb
94
-        fi
95
-        cryptsetup luksClose encrypted_usb
96
-        cryptsetup luksOpen $USB_DRIVE encrypted_usb
97
-        if [ "$?" = "0" ]; then
98
-            USB_DRIVE=/dev/mapper/encrypted_usb
99
-        fi
100
-        mount $USB_DRIVE $GPG_USB_MOUNT
101
-        if [ ! "$?" = "0" ]; then
88
+        if [ ! -d $USB_MOUNT ]; then
102
             if (( GPG_CTR > 0 )); then
89
             if (( GPG_CTR > 0 )); then
103
-                rm -rf $GPG_USB_MOUNT
90
+                backup_unmount_drive ${USB_DRIVE}
104
                 reconstruct_key
91
                 reconstruct_key
105
                 return 0
92
                 return 0
106
             fi
93
             fi
107
             dialog --title $"Recover Encryption Keys" \
94
             dialog --title $"Recover Encryption Keys" \
108
-                   --msgbox $"There was a problem mounting the USB drive to $GPG_USB_MOUNT" 6 70
109
-            rm -rf $GPG_USB_MOUNT
95
+                   --msgbox $"There was a problem mounting the USB drive $USB_DRIVE to $USB_MOUNT" 6 70
96
+            backup_unmount_drive ${USB_DRIVE}
110
             exit 74393
97
             exit 74393
111
         fi
98
         fi
112
 
99
 
113
-        if [ ! -d $GPG_USB_MOUNT/.gnupg ]; then
114
-            if [ ! -d $GPG_USB_MOUNT/.gnupg_fragments ]; then
100
+        if [ ! -d $USB_MOUNT/.gnupg ]; then
101
+            if [ ! -d $USB_MOUNT/.gnupg_fragments ]; then
115
                 if (( GPG_CTR > 0 )); then
102
                 if (( GPG_CTR > 0 )); then
116
-                    umount -f $GPG_USB_MOUNT
117
-                    rm -rf $GPG_USB_MOUNT
103
+                    backup_unmount_drive ${USB_DRIVE}
118
                     reconstruct_key
104
                     reconstruct_key
119
                     return 0
105
                     return 0
120
                 fi
106
                 fi
121
                 dialog --title $"Recover Encryption Keys" \
107
                 dialog --title $"Recover Encryption Keys" \
122
-                       --msgbox $"The directory $GPG_USB_MOUNT/.gnupg or $GPG_USB_MOUNT/.gnupg_fragments was not found" 6 70
123
-                umount -f $GPG_USB_MOUNT
124
-                rm -rf $GPG_USB_MOUNT
108
+                       --msgbox $"The directory $USB_MOUNT/.gnupg or $USB_MOUNT/.gnupg_fragments was not found" 6 70
109
+                backup_unmount_drive ${USB_DRIVE}
125
                 exit 723814
110
                 exit 723814
126
             fi
111
             fi
127
         fi
112
         fi
128
 
113
 
129
-        if [ -d $GPG_USB_MOUNT/letsencrypt ]; then
114
+        if [ -d $USB_MOUNT/letsencrypt ]; then
130
             if [ ! -d /etc/letsencrypt ]; then
115
             if [ ! -d /etc/letsencrypt ]; then
131
                 mkdir /etc/letsencrypt
116
                 mkdir /etc/letsencrypt
132
             fi
117
             fi
133
             echo $'Recovering LetsEncrypt keys'
118
             echo $'Recovering LetsEncrypt keys'
134
-            cp -r $GPG_USB_MOUNT/letsencrypt/* /etc/letsencrypt
119
+            cp -r $USB_MOUNT/letsencrypt/* /etc/letsencrypt
135
         fi
120
         fi
136
 
121
 
137
-        if [ -d $GPG_USB_MOUNT/.gnupg ]; then
122
+        if [ -d $USB_MOUNT/.gnupg ]; then
138
             if [ ! -d $HOME_DIR/.gnupg ]; then
123
             if [ ! -d $HOME_DIR/.gnupg ]; then
139
                 mkdir $HOME_DIR/.gnupg
124
                 mkdir $HOME_DIR/.gnupg
140
             fi
125
             fi
141
             echo $'Recovering GPG keys'
126
             echo $'Recovering GPG keys'
142
-            cp -r $GPG_USB_MOUNT/.gnupg/* $HOME_DIR/.gnupg
127
+            cp -r $USB_MOUNT/.gnupg/* $HOME_DIR/.gnupg
143
             GPG_LOADING="no"
128
             GPG_LOADING="no"
144
             dialog --title $"Recover Encryption Keys" \
129
             dialog --title $"Recover Encryption Keys" \
145
                    --msgbox $"GPG Keyring loaded to $HOME_DIR" 6 70
130
                    --msgbox $"GPG Keyring loaded to $HOME_DIR" 6 70
147
             if [ ! -d $HOME_DIR/.gnupg_fragments ]; then
132
             if [ ! -d $HOME_DIR/.gnupg_fragments ]; then
148
                 mkdir $HOME_DIR/.gnupg_fragments
133
                 mkdir $HOME_DIR/.gnupg_fragments
149
             fi
134
             fi
150
-            cp -r $GPG_USB_MOUNT/.gnupg_fragments/* $HOME_DIR/.gnupg_fragments
135
+            cp -r $USB_MOUNT/.gnupg_fragments/* $HOME_DIR/.gnupg_fragments
151
         fi
136
         fi
152
 
137
 
153
         if [[ $SSH_IMPORTED == "no" ]]; then
138
         if [[ $SSH_IMPORTED == "no" ]]; then
154
-            if [ -d $GPG_USB_MOUNT/.ssh ]; then
139
+            if [ -d $USB_MOUNT/.ssh ]; then
155
                 if [ ! -d $HOME_DIR/.ssh ]; then
140
                 if [ ! -d $HOME_DIR/.ssh ]; then
156
                     mkdir $HOME_DIR/.ssh
141
                     mkdir $HOME_DIR/.ssh
157
                 fi
142
                 fi
158
-                cp $GPG_USB_MOUNT/.ssh/* $HOME_DIR/.ssh
143
+                cp $USB_MOUNT/.ssh/* $HOME_DIR/.ssh
159
                 dialog --title $"Recover Encryption Keys" \
144
                 dialog --title $"Recover Encryption Keys" \
160
                        --msgbox $"ssh keys imported" 6 70
145
                        --msgbox $"ssh keys imported" 6 70
161
                 SSH_IMPORTED="yes"
146
                 SSH_IMPORTED="yes"
162
             fi
147
             fi
163
         fi
148
         fi
164
 
149
 
165
-        umount -f $GPG_USB_MOUNT
166
-        rm -rf $GPG_USB_MOUNT
150
+        backup_unmount_drive ${USB_DRIVE}
167
         if [[ $GPG_LOADING == "yes" ]]; then
151
         if [[ $GPG_LOADING == "yes" ]]; then
168
             dialog --title $"Recover Encryption Keys" \
152
             dialog --title $"Recover Encryption Keys" \
169
                    --msgbox $"Now remove the USB drive. Insert the next drive containing a key fragment, or select Ok to finish" 6 70
153
                    --msgbox $"Now remove the USB drive. Insert the next drive containing a key fragment, or select Ok to finish" 6 70