0e288fc9c5
- Add upstream patch 0001-machine-don-t-return-uninitialized-variable.patch - Port and add upstream patch 0002-vconsole-setup-run-setfont-before-loadkeys.patch - Rename 0001-udev-net_setup_link-add-a-bit-more-logging.patch to 1048-udev-net_setup_link-add-a-bit-more-logging.patch - Port and add upstream patches 0001-udev-net_setup_link-add-a-bit-more-logging.patch 0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch 0002-namespace-fix-uninitialized-memory-access.patch - Add upstream patches 0001-architecture-Add-tilegx.patch 0002-architecture-Add-cris.patch 0003-arch-add-crisv32-to-uname-check.patch 0004-architecture-remove-cris-from-uname-list.patch - Add upstream patches 0006-hwdb-update.patch 0007-hwdb-Update-database-of-Bluetooth-company-identifier.patch - Add upstream patches 0001-parse_uid-return-ENXIO-for-1-uids.patch 0002-util-when-unescaping-strings-don-t-allow-smuggling-i.patch 0003-localed-consider-an-unset-model-as-a-wildcard.patch 0004-sd-bus-when-an-event-loop-terminates-explicitly-clos.patch OBS-URL: https://build.opensuse.org/request/show/239780 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=191
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From 387066c2e5bda159201896b194711965b52f34a9 Mon Sep 17 00:00:00 2001
|
|
From: Michal Sekletar <msekleta@redhat.com>
|
|
Date: Fri, 30 May 2014 18:20:16 +0200
|
|
Subject: [PATCH] localed: consider an unset model as a wildcard
|
|
|
|
---
|
|
src/locale/localed.c | 13 +++++++------
|
|
1 file changed, 7 insertions(+), 6 deletions(-)
|
|
|
|
diff --git src/locale/localed.c src/locale/localed.c
|
|
index e3061c8..358f6c2 100644
|
|
--- src/locale/localed.c
|
|
+++ src/locale/localed.c
|
|
@@ -712,15 +712,16 @@ static int find_legacy_keymap(Context *c, char **new_keymap) {
|
|
}
|
|
}
|
|
|
|
- if (matching > 0 &&
|
|
- streq_ptr(c->x11_model, a[2])) {
|
|
- matching++;
|
|
-
|
|
- if (streq_ptr(c->x11_variant, a[3])) {
|
|
+ if (matching > 0) {
|
|
+ if (isempty(c->x11_model) || streq_ptr(c->x11_model, a[2])) {
|
|
matching++;
|
|
|
|
- if (streq_ptr(c->x11_options, a[4]))
|
|
+ if (streq_ptr(c->x11_variant, a[3])) {
|
|
matching++;
|
|
+
|
|
+ if (streq_ptr(c->x11_options, a[4]))
|
|
+ matching++;
|
|
+ }
|
|
}
|
|
}
|
|
|
|
--
|
|
1.7.9.2
|
|
|