Browse Source

Force unmount

Bob Mottram 9 years ago
parent
commit
4bbfd4536b
1 changed files with 8 additions and 8 deletions
  1. 8
    8
      src/freedombone-keydrive

+ 8
- 8
src/freedombone-keydrive View File

@@ -107,7 +107,7 @@ fi
107 107
 if [[ $MASTER_DRIVE == "yes" || $MASTER_DRIVE == "y" || $MASTER_DRIVE == "1" ]]; then
108 108
   if [ ! -d /home/$MY_USERNAME/.gnupg ]; then
109 109
       echo "No .gnupg directory was found for $MY_USERNAME"
110
-      umount $USB_MOUNT
110
+      umount -f $USB_MOUNT
111 111
       rm -rf $USB_MOUNT
112 112
       exit 73025
113 113
   fi
@@ -117,7 +117,7 @@ if [[ $MASTER_DRIVE == "yes" || $MASTER_DRIVE == "y" || $MASTER_DRIVE == "1" ]];
117 117
   else
118 118
       echo "Unable to copy gpg keyring to $USB_DRIVE"
119 119
   fi
120
-  umount $USB_MOUNT
120
+  umount -f $USB_MOUNT
121 121
   rm -rf $USB_MOUNT
122 122
   exit 0
123 123
 fi
@@ -135,7 +135,7 @@ if [ ! -d $FRAGMENTS_DIR ]; then
135 135
 fi
136 136
 if [ ! -d $FRAGMENTS_DIR ]; then
137 137
   echo "There was a problem making the directory $FRAGMENTS_DIR"
138
-  umount $USB_MOUNT
138
+  umount -f $USB_MOUNT
139 139
   rm -rf $USB_MOUNT
140 140
   exit 6843
141 141
 fi
@@ -149,7 +149,7 @@ else
149 149
 fi
150 150
 if (( no_of_usb_shares > 0 )); then
151 151
   echo "A key fragment already exists on the drive for the user $MY_USERNAME"
152
-  umount $USB_MOUNT
152
+  umount -f $USB_MOUNT
153 153
   rm -rf $USB_MOUNT
154 154
   exit 58945
155 155
 fi
@@ -181,7 +181,7 @@ fi
181 181
 
182 182
 if (( no_of_local_shares < 3 )); then
183 183
     echo "Not enough key fragments available ${no_of_local_shares}"
184
-    umount $USB_MOUNT
184
+    umount -f $USB_MOUNT
185 185
     rm -rf $USB_MOUNT
186 186
     exit 63386
187 187
 fi
@@ -196,18 +196,18 @@ no_of_usb_shares=$((no_of_usb_shares - 2))
196 196
 if (( no_of_usb_shares > 1 )); then
197 197
     echo "Too many key fragments exist in $FRAGMENTS_DIR"
198 198
     ls $FRAGMENTS_DIR
199
-    umount $USB_MOUNT
199
+    umount -f $USB_MOUNT
200 200
     rm -rf $USB_MOUNT
201 201
     exit 54292
202 202
 fi
203 203
 if (( no_of_usb_shares <= 0 )); then
204 204
     echo "There was a problem copying the key fragment to $USB_DRIVE"
205 205
     ls $FRAGMENTS_DIR
206
-    umount $USB_MOUNT
206
+    umount -f $USB_MOUNT
207 207
     rm -rf $USB_MOUNT
208 208
     exit 54292
209 209
 fi
210
-umount $USB_MOUNT
210
+umount -f $USB_MOUNT
211 211
 rm -rf $USB_MOUNT
212 212
 echo "Key fragment copied to $USB_DRIVE. You may now remove the drive."
213 213