浏览代码

usb drive option to keydrive can include path

Bob Mottram 7 年前
父节点
当前提交
5831b29fb5
共有 2 个文件被更改,包括 7 次插入3 次删除
  1. 2
    2
      src/freedombone-controlpanel
  2. 5
    1
      src/freedombone-keydrive

+ 2
- 2
src/freedombone-controlpanel 查看文件

@@ -1055,7 +1055,7 @@ function create_keydrive_master {
1055 1055
            --msgbox $"Plug in a LUKS encrypted USB drive" 6 40
1056 1056
     clear
1057 1057
     detect_usb_drive
1058
-    ${PROJECT_NAME}-keydrive -u $SELECTED_USERNAME --master 'yes'
1058
+    ${PROJECT_NAME}-keydrive -u $SELECTED_USERNAME --master 'yes' -d $USB_DRIVE
1059 1059
     any_key
1060 1060
 }
1061 1061
 
@@ -1068,7 +1068,7 @@ function create_keydrive_fragment {
1068 1068
            --msgbox $"Plug in a LUKS encrypted USB drive" 6 40
1069 1069
     clear
1070 1070
     detect_usb_drive
1071
-    ${PROJECT_NAME}-keydrive -u $SELECTED_USERNAME
1071
+    ${PROJECT_NAME}-keydrive -u $SELECTED_USERNAME -d $USB_DRIVE
1072 1072
     any_key
1073 1073
 }
1074 1074
 

+ 5
- 1
src/freedombone-keydrive 查看文件

@@ -62,7 +62,11 @@ case $key in
62 62
     ;;
63 63
     -d|--dev)
64 64
     shift
65
-    USB_DRIVE=/dev/${1}1
65
+    if [[ "${1}" != '/dev/'* ]]; then
66
+        USB_DRIVE=/dev/${1}1
67
+    else
68
+        USB_DRIVE=${1}
69
+    fi
66 70
     ;;
67 71
     -m|--master)
68 72
     shift