From 90a8c95446b345cc9b388fdb30866e1cb77fe711 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Sat, 25 Feb 2017 14:59:19 -0500 Subject: src/udev/udev-rules.c: fix global properties, issue #142 An important hunk was lost when merging systemd commit adeba500 leading to broken global properties, issue #142. This commit fixes this bug. Signed-off-by: Anthony G. Basile --- src/udev/udev-rules.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index e2bb99ca7d..c4f422187f 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -1963,7 +1963,18 @@ int udev_rules_apply_to_event(struct udev_rules *rules, const char *value; value = udev_device_get_property_value(event->dev, key_name); - if (value == NULL) + + /* check global properties */ + if (!value && properties_list) { + struct udev_list_entry *list_entry; + + list_entry = udev_list_get_entry(properties_list); + list_entry = udev_list_entry_get_by_name(list_entry, key_name); + if (list_entry != NULL) + value = udev_list_entry_get_value(list_entry); + } + + if (!value) value = ""; if (match_key(rules, cur, value)) goto nomatch; -- cgit v1.2.3-54-g00ecf