Bob Mottram 9 年前
父节点
当前提交
5039a5526e
共有 1 个文件被更改,包括 5 次插入3 次删除
  1. 5
    3
      src/freedombone-format

+ 5
- 3
src/freedombone-format 查看文件

34
    exit 1
34
    exit 1
35
 fi
35
 fi
36
 
36
 
37
-USB_DRIVE=/dev/$1
37
+USB_DRIVE=/dev/${1}
38
 
38
 
39
 echo "Formatting $USB_DRIVE as LUKS"
39
 echo "Formatting $USB_DRIVE as LUKS"
40
-cryptsetup -y -v luksFormat $USB_DRIVE
40
+cryptsetup -y -v luksFormat ${USB_DRIVE}
41
 if [ ! "$?" = "0" ]; then
41
 if [ ! "$?" = "0" ]; then
42
     echo "Failed to format $USB_DRIVE as LUKS"
42
     echo "Failed to format $USB_DRIVE as LUKS"
43
     exit 36823
43
     exit 36823
44
 fi
44
 fi
45
-cryptsetup luksOpen $USB_DRIVE encrypted_usb
45
+cryptsetup luksOpen ${USB_DRIVE} encrypted_usb
46
 if [ ! "$?" = "0" ]; then
46
 if [ ! "$?" = "0" ]; then
47
     echo "Failed to open LUKS formatted drive $USB_DRIVE"
47
     echo "Failed to open LUKS formatted drive $USB_DRIVE"
48
     exit 37232
48
     exit 37232
49
 fi
49
 fi
50
 mkfs.ext4 /dev/mapper/encrypted_usb
50
 mkfs.ext4 /dev/mapper/encrypted_usb
51
 if [ ! "$?" = "0" ]; then
51
 if [ ! "$?" = "0" ]; then
52
+    cryptsetup luksClose encrypted_usb
52
     echo 'Format of drive $USB_DRIVE failed'
53
     echo 'Format of drive $USB_DRIVE failed'
53
     exit 73218
54
     exit 73218
54
 fi
55
 fi
56
+sleep 2
55
 cryptsetup luksClose encrypted_usb
57
 cryptsetup luksClose encrypted_usb
56
 if [ -f /dev/mapper/encrypted_usb ]; then
58
 if [ -f /dev/mapper/encrypted_usb ]; then
57
     rm -rf /dev/mapper/encrypted_usb
59
     rm -rf /dev/mapper/encrypted_usb