浏览代码

Force unmount

Bob Mottram 10 年前
父节点
当前提交
4bbfd4536b
共有 1 个文件被更改,包括 8 次插入8 次删除
  1. 8
    8
      src/freedombone-keydrive

+ 8
- 8
src/freedombone-keydrive 查看文件

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