|
@@ -150,9 +150,10 @@ function search_for_attached_usb_drive {
|
150
|
150
|
if grep -Fxq "search_for_attached_usb_drive" $COMPLETION_FILE; then
|
151
|
151
|
return
|
152
|
152
|
fi
|
153
|
|
- if [ -d $USB_DRIVE ]; then
|
|
153
|
+ if [ -b $USB_DRIVE ]; then
|
154
|
154
|
if [ ! -d /media/usb ]; then
|
155
|
155
|
echo 'Mounting USB drive'
|
|
156
|
+ mkdir /media/usb
|
156
|
157
|
mount $USB_DRIVE /media/usb
|
157
|
158
|
fi
|
158
|
159
|
if [ -d /media/usb/Maildir ]; then
|
|
@@ -201,6 +202,12 @@ function search_for_attached_usb_drive {
|
201
|
202
|
cp -r /media/usb/personal /home/$MY_USERNAME/personal
|
202
|
203
|
chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/personal
|
203
|
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
|
211
|
fi
|
205
|
212
|
echo 'search_for_attached_usb_drive' >> $COMPLETION_FILE
|
206
|
213
|
}
|
|
@@ -1203,6 +1210,11 @@ function install_final {
|
1203
|
1210
|
if grep -Fxq "install_final" $COMPLETION_FILE; then
|
1204
|
1211
|
return
|
1205
|
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
|
1218
|
echo 'install_final' >> $COMPLETION_FILE
|
1207
|
1219
|
echo ''
|
1208
|
1220
|
echo ' *** Freedombone installation is complete. Rebooting... ***'
|