diff --git a/playbook.yml b/playbook.yml
index c54fcfe..c515205 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -28,7 +28,7 @@
function: '0'
usb_device_ids: []
keyboards:
- - '/dev/input/by-path/platform-i8042-serio-0-event-kbd'
+ - '/dev/input/by-id/usb-Keychron_K4_Keychron_K4-event-kbd'
mice: []
roles:
- win10
diff --git a/roles/win10/tasks/main.yml b/roles/win10/tasks/main.yml
index e529b70..cd76fb6 100644
--- a/roles/win10/tasks/main.yml
+++ b/roles/win10/tasks/main.yml
@@ -99,10 +99,10 @@
block: |
cgroup_device_acl = [
{% for item in keyboards %}
- "/dev/input/by-id/uinput-persist-keyboard{{ loop.index0 }}",
+ "{{ item }}",
{% endfor %}
{% for item in mice %}
- "/dev/input/by-id/uinput-persist-mouse{{ loop.index0 }}",
+ "{ item }}",
{% endfor %}
"/dev/kvm",
"/dev/null", "/dev/full", "/dev/zero",
diff --git a/roles/win10/templates/persistent-evdev/config.json.j2 b/roles/win10/templates/persistent-evdev/config.json.j2
index 60e02b6..aa9df9e 100644
--- a/roles/win10/templates/persistent-evdev/config.json.j2
+++ b/roles/win10/templates/persistent-evdev/config.json.j2
@@ -1,12 +1,13 @@
{
"cache": "/opt/persistent-evdev/cache",
"devices": {
+ {% if keyboards or mice %}
{% for item in keyboards %}
- "persist-keyboard{{loop.index0}}": "{{ item }}",
+ "persist-keyboard{{loop.index0}}": "{{ item }}"{%if not loop.last or mice %},{% endif %}
{% endfor %}
{% for item in mice %}
- "persist-mouse{{loop.index0}}": "{{ item }}",
+ "persist-mouse{{loop.index0}}": "{{ item }}"{%if not loop.last %},{% endif %}
{% endfor %}
- "dummy" : "/dev/null"
+ {% endif %}
}
}
\ No newline at end of file
diff --git a/roles/win10/templates/win10.xml b/roles/win10/templates/win10.xml
index 5d68f67..6e2c852 100644
--- a/roles/win10/templates/win10.xml
+++ b/roles/win10/templates/win10.xml
@@ -99,7 +99,7 @@
-
+