Qubes/core-admin-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qvm-start-daemon: check if layout is parsed

Browse Source
This commit is contained in:
Frédéric Pierret (fepitre) 2020-03-28 10:06:50 +01:00
parent 2e72f75611
commit e39f280405
No known key found for this signature in database
GPG Key ID: 484010B5CDC576E2
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qubesadmin/tools/qvm_start_daemon.py
View File

@ -127,11 +127,14 @@ def set_keyboard_layout(vm):
xkb_rules_names = subprocess.check_output( xkb_rules_names = subprocess.check_output(
['xprop', '-root', '_XKB_RULES_NAMES']).decode() ['xprop', '-root', '_XKB_RULES_NAMES']).decode()
xkb_parsed = re.match(xkb_re, xkb_rules_names) xkb_parsed = re.match(xkb_re, xkb_rules_names)
if xkb_parsed:
xkb_layout = [x.split(',')[0] for x in xkb_parsed.groups()[2:4]] xkb_layout = [x.split(',')[0] for x in xkb_parsed.groups()[2:4]]
# We keep all options # We keep all options
xkb_layout.append(xkb_parsed.group(5)) xkb_layout.append(xkb_parsed.group(5))
keyboard_layout = '+'.join(xkb_layout) keyboard_layout = '+'.join(xkb_layout)
vm.features['keyboard-layout'] = keyboard_layout vm.features['keyboard-layout'] = keyboard_layout
else:
vm.log.warning('Failed to parse layout for %s', vm)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
vm.log.warning('Failed to set layout for %s: %s', vm, str(e)) vm.log.warning('Failed to set layout for %s: %s', vm, str(e))