Pārlūkot izejas kodu

Unmount encrypted USB drive

Bob Mottram 10 gadus atpakaļ
vecāks
revīzija
860ae1a833
1 mainītis faili ar 28 papildinājumiem un 1 dzēšanām
  1. 28
    1
      src/freedombone

+ 28
- 1
src/freedombone Parādīt failu

@@ -1574,9 +1574,13 @@ function create_backup_script {
1574 1574
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
1575 1575
   echo "umount -f $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
1576 1576
   echo "mkdir $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
1577
+  echo 'if [ -f /dev/mapper/encrypted_usb ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
1578
+  echo '  rm -rf /dev/mapper/encrypted_usb' >> /usr/bin/$BACKUP_SCRIPT_NAME
1579
+  echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
1580
+  echo 'cryptsetup luksClose encrypted_usb' >> /usr/bin/$BACKUP_SCRIPT_NAME
1577 1581
   echo 'cryptsetup luksOpen $USB_DRIVE encrypted_usb' >> /usr/bin/$BACKUP_SCRIPT_NAME
1578 1582
   echo 'if [ "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
1579
-  echo '    USB_DRIVE=/dev/mapper/encrypted_usb' >> /usr/bin/$BACKUP_SCRIPT_NAME
1583
+  echo '  USB_DRIVE=/dev/mapper/encrypted_usb' >> /usr/bin/$BACKUP_SCRIPT_NAME
1580 1584
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
1581 1585
   echo -n 'mount $USB_DRIVE ' >> /usr/bin/$BACKUP_SCRIPT_NAME
1582 1586
   echo "$USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -2151,6 +2155,15 @@ function create_backup_script {
2151 2155
   echo '  exit 46994' >> /usr/bin/$BACKUP_SCRIPT_NAME
2152 2156
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2153 2157
   echo "rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2158
+
2159
+  echo 'if [[ $USB_DRIVE == /dev/mapper/encrypted_usb ]]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2160
+  echo '  echo "Unmount encrypted USB"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2161
+  echo '  cryptsetup luksClose encrypted_usb' >> /usr/bin/$BACKUP_SCRIPT_NAME
2162
+  echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2163
+  echo 'if [ -f /dev/mapper/encrypted_usb ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2164
+  echo '  rm -rf /dev/mapper/encrypted_usb' >> /usr/bin/$BACKUP_SCRIPT_NAME
2165
+  echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2166
+
2154 2167
   echo 'echo "Backup to USB drive is complete. You can now unplug it."' >> /usr/bin/$BACKUP_SCRIPT_NAME
2155 2168
   echo 'exit 0' >> /usr/bin/$BACKUP_SCRIPT_NAME
2156 2169
   chmod 400 /usr/bin/$BACKUP_SCRIPT_NAME
@@ -2185,6 +2198,10 @@ function create_restore_script {
2185 2198
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
2186 2199
   echo "if [ ! -d $USB_MOUNT ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
2187 2200
   echo "  mkdir $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
2201
+  echo '  if [ -f /dev/mapper/encrypted_usb ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
2202
+  echo '    rm -rf /dev/mapper/encrypted_usb' >> /usr/bin/$RESTORE_SCRIPT_NAME
2203
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
2204
+  echo '  cryptsetup luksClose encrypted_usb' >> /usr/bin/$RESTORE_SCRIPT_NAME
2188 2205
   echo '  cryptsetup luksOpen $USB_DRIVE encrypted_usb' >> /usr/bin/$RESTORE_SCRIPT_NAME
2189 2206
   echo '  if [ "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
2190 2207
   echo '      USB_DRIVE=/dev/mapper/encrypted_usb' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -2839,6 +2856,16 @@ function create_restore_script {
2839 2856
   echo 'echo "Setting permissions"' >> /usr/bin/$RESTORE_SCRIPT_NAME
2840 2857
   echo "chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
2841 2858
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
2859
+
2860
+  echo 'if [[ $USB_DRIVE == /dev/mapper/encrypted_usb ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
2861
+  echo '  echo "Unmount encrypted USB"' >> /usr/bin/$RESTORE_SCRIPT_NAME
2862
+  echo '  cryptsetup luksClose encrypted_usb' >> /usr/bin/$RESTORE_SCRIPT_NAME
2863
+  echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
2864
+  echo 'if [ -f /dev/mapper/encrypted_usb ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
2865
+  echo '  rm -rf /dev/mapper/encrypted_usb' >> /usr/bin/$RESTORE_SCRIPT_NAME
2866
+  echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
2867
+  echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
2868
+
2842 2869
   echo 'echo "Restore from USB drive is complete. You can now remove it."' >> /usr/bin/$RESTORE_SCRIPT_NAME
2843 2870
   echo 'exit 0' >> /usr/bin/$RESTORE_SCRIPT_NAME
2844 2871
   chmod 400 /usr/bin/$RESTORE_SCRIPT_NAME