ba698f40db
9a9f9ecd-ignore-comments-in-keymap-conf-files.patch 9617d126-systray-Use-APPLICATION_STATUS-for-appindicator.patch e73abe5a-diskbackend-convert-to-long-the-calculated-size.patch 6e6f59e7-diskbackend-get-a-proper-size-of-existing-block-device-while-cloning.patch 23aaf852-network-Set-bridge-name-to-None-instead-of-blank.patch d1e1cf64-progress-remove-trailing-white-space.patch 63fce081-pycodestyle-Use-isinstance-for-type-checking.patch 08a58d61-pycodestyle-remove-description-of-fixed-errors.patch bc3c9a9d-progress-remove-unused-import.patch 2d276ebe-progress-dont-overwrite-format.patch e2ad4b2f-convert-iteritems-to-items.patch dff00d4f-remove-deprecated-statvfs-module.patch 75210ed3-replace-StringIO-with-io.patch a2bcd6c4-dont-compare-between-None-and-int.patch 44de92b7-use-reload-from-imp-module.patch 69c84bea-import-reduce-from-functools-module.patch 37ea5207-replace-StandardError-with-Exception.patch f41aafc7-Use-enumerate-instead-of-range-and-len.patch 91c0669c-cli-Fix-OrderedDict-mutated-during-iteration-on-python3.patch b8fa0c6b-xmlnsqemu-order-XML-output-like-libvirt-does.patch d2648d81-virtconv-dont-implicitly-depend-on-dict-hash-order.patch 999dbb36-cli-Make-VirtCLIArgument-instantiation-less-crazy.patch 7f1b4cee-pycodestyle-fix-all-E125-warnings.patch d82022bd-manager-drop-python2-only-cmp-usage.patch 374a3779-urlfetcher-write-test-file-as-binary-content.patch f7c8cf9f-devicepanic-dont-return-empty-model-list.patch 3be78d1f-addhardware-dont-allow-panic-option-where-not-supported.patch 73de8285-systray-remove-redundant-variable-assignment.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=375
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
Subject: virtinst: ignore comments in keymap conf files
|
|
From: Jim Fehlig jfehlig@suse.com Wed Oct 11 15:13:26 2017 -0600
|
|
Date: Wed Oct 18 17:46:41 2017 -0400:
|
|
Git: 9a9f9ecd2c1f03665809009ad6cfde937b09adaa
|
|
|
|
On a host system with keyboard configured to en-US, it was noticed
|
|
that virt-install created install XML with keymap='de'. The host
|
|
system did not have /etc/vconsole.conf, so /etc/sysconfig/keyboard
|
|
was the next file to check, which contained the following
|
|
|
|
KEYTABLE=""
|
|
|
|
Currently the parsing code does not ignore comments and incorrectly
|
|
parsed a 'de' keymap. Fix by ignoring any lines that start with '#'
|
|
after trimming whitespace.
|
|
|
|
diff --git a/virtinst/hostkeymap.py b/virtinst/hostkeymap.py
|
|
index 71503730..87a80ef6 100644
|
|
--- a/virtinst/hostkeymap.py
|
|
+++ b/virtinst/hostkeymap.py
|
|
@@ -71,6 +71,9 @@ def _sysconfig_keyboard(f):
|
|
s = f.readline()
|
|
if s == "":
|
|
break
|
|
+ s = s.strip()
|
|
+ if s.startswith("#"):
|
|
+ continue
|
|
if (re.search("KEYMAP", s) is not None or
|
|
re.search("KEYTABLE", s) is not None or
|
|
(re.search("KEYBOARD", s) is not None and
|