| 
				
			 | 
			
			
				@@ -13,7 +13,7 @@ 
			 | 
		
	
		
			
			| 
				13
			 | 
			
				13
			 | 
			
			
				 # License 
			 | 
		
	
		
			
			| 
				14
			 | 
			
				14
			 | 
			
			
				 # ======= 
			 | 
		
	
		
			
			| 
				15
			 | 
			
				15
			 | 
			
			
				 # 
			 | 
		
	
		
			
			| 
				16
			 | 
			
				
			 | 
			
			
				-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net> 
			 | 
		
	
		
			
			| 
				
			 | 
			
				16
			 | 
			
			
				+# Copyright (C) 2015-2018 Bob Mottram <bob@freedombone.net> 
			 | 
		
	
		
			
			| 
				17
			 | 
			
				17
			 | 
			
			
				 # 
			 | 
		
	
		
			
			| 
				18
			 | 
			
				18
			 | 
			
			
				 # This program is free software: you can redistribute it and/or modify 
			 | 
		
	
		
			
			| 
				19
			 | 
			
				19
			 | 
			
			
				 # it under the terms of the GNU Affero General Public License as published by 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -62,7 +62,7 @@ p 
			 | 
		
	
		
			
			| 
				62
			 | 
			
				62
			 | 
			
			
				 a 
			 | 
		
	
		
			
			| 
				63
			 | 
			
				63
			 | 
			
			
				 1 
			 | 
		
	
		
			
			| 
				64
			 | 
			
				64
			 | 
			
			
				 w 
			 | 
		
	
		
			
			| 
				65
			 | 
			
				
			 | 
			
			
				-" | fdisk /dev/${USB_DRIVE_SHORT};mkfs.ext4 -L "$LABEL" /dev/${USB_DRIVE_SHORT}1 
			 | 
		
	
		
			
			| 
				
			 | 
			
				65
			 | 
			
			
				+" | fdisk /dev/${USB_DRIVE_SHORT};mkfs.msdos -F 32 -L "$LABEL" /dev/${USB_DRIVE_SHORT}1 
			 | 
		
	
		
			
			| 
				66
			 | 
			
				66
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				67
			 | 
			
				67
			 | 
			
			
				 echo $"Formatting $USB_DRIVE as LUKS" 
			 | 
		
	
		
			
			| 
				68
			 | 
			
				68
			 | 
			
			
				 cryptsetup -y -v luksFormat ${USB_DRIVE} 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -75,7 +75,7 @@ if [ ! "$?" = "0" ]; then 
			 | 
		
	
		
			
			| 
				75
			 | 
			
				75
			 | 
			
			
				     echo $"Failed to open LUKS formatted drive $USB_DRIVE" 
			 | 
		
	
		
			
			| 
				76
			 | 
			
				76
			 | 
			
			
				     exit 37232 
			 | 
		
	
		
			
			| 
				77
			 | 
			
				77
			 | 
			
			
				 fi 
			 | 
		
	
		
			
			| 
				78
			 | 
			
				
			 | 
			
			
				-mkfs.ext4 /dev/mapper/encrypted_usb -L "$LABEL" 
			 | 
		
	
		
			
			| 
				
			 | 
			
				78
			 | 
			
			
				+mkfs.msdos -F 32 /dev/mapper/encrypted_usb -L "$LABEL" 
			 | 
		
	
		
			
			| 
				79
			 | 
			
				79
			 | 
			
			
				 if [ ! "$?" = "0" ]; then 
			 | 
		
	
		
			
			| 
				80
			 | 
			
				80
			 | 
			
			
				     cryptsetup luksClose encrypted_usb 
			 | 
		
	
		
			
			| 
				81
			 | 
			
				81
			 | 
			
			
				     echo $'Format of drive $USB_DRIVE failed' 
			 |