浏览代码

Unmounting

Bob Mottram 11 年前
父节点
当前提交
89d2f139c0
共有 1 个文件被更改,包括 13 次插入1 次删除
  1. 13
    1
      install-freedombone.sh

+ 13
- 1
install-freedombone.sh 查看文件

150
   if grep -Fxq "search_for_attached_usb_drive" $COMPLETION_FILE; then
150
   if grep -Fxq "search_for_attached_usb_drive" $COMPLETION_FILE; then
151
       return
151
       return
152
   fi
152
   fi
153
-  if [ -d $USB_DRIVE ]; then
153
+  if [ -b $USB_DRIVE ]; then
154
       if [ ! -d /media/usb ]; then
154
       if [ ! -d /media/usb ]; then
155
           echo 'Mounting USB drive'
155
           echo 'Mounting USB drive'
156
+		  mkdir /media/usb
156
           mount $USB_DRIVE /media/usb
157
           mount $USB_DRIVE /media/usb
157
       fi
158
       fi
158
       if [ -d /media/usb/Maildir ]; then
159
       if [ -d /media/usb/Maildir ]; then
201
           cp -r /media/usb/personal /home/$MY_USERNAME/personal
202
           cp -r /media/usb/personal /home/$MY_USERNAME/personal
202
           chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/personal
203
           chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/personal
203
       fi
204
       fi
205
+  else
206
+      if [ -d /media/usb ]; then
207
+		  umount /media/usb
208
+          rm -rf /media/usb
209
+      fi
210
+      echo 'No USB drive attached'
204
   fi
211
   fi
205
   echo 'search_for_attached_usb_drive' >> $COMPLETION_FILE
212
   echo 'search_for_attached_usb_drive' >> $COMPLETION_FILE
206
 }
213
 }
1203
   if grep -Fxq "install_final" $COMPLETION_FILE; then
1210
   if grep -Fxq "install_final" $COMPLETION_FILE; then
1204
       return
1211
       return
1205
   fi
1212
   fi
1213
+  # unmount any attached usb drive
1214
+  if [ -d /media/usb ]; then
1215
+      umount /media/usb
1216
+      rm -rf /media/usb
1217
+  fi
1206
   echo 'install_final' >> $COMPLETION_FILE
1218
   echo 'install_final' >> $COMPLETION_FILE
1207
   echo ''
1219
   echo ''
1208
   echo '  *** Freedombone installation is complete. Rebooting... ***'
1220
   echo '  *** Freedombone installation is complete. Rebooting... ***'