From ca948c9601714c8de53a87a548dfad05fef37c40 Mon Sep 17 00:00:00 2001 From: msizanoen1 Date: Tue, 27 Dec 2022 11:57:12 +0700 Subject: [PATCH] udev: match device tags in rules using current device tags This ensures that udev scripts using `TAG-="..."` and expecting later udev rules to honor it will work properly. An use case is removing the `uaccess` tag from a device without overriding the original file and ensuring that `73-seat-uaccess.rules` won't run the uaccess builtin later. (cherry picked from commit 310249903986957997b76bc52441cabb5843aad8) (cherry picked from commit 7d4ea095d5e3e5aa87761c6c0f5f30287596dd75) --- src/udev/udev-rules.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index f95b751b75..9dc68e401e 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -1622,7 +1622,7 @@ static int udev_rule_apply_token_to_event( case TK_M_PARENTS_TAG: { const char *val; - FOREACH_DEVICE_TAG(dev, val) + FOREACH_DEVICE_CURRENT_TAG(dev, val) if (token_match_string(token, val)) return token->op == OP_MATCH; return token->op == OP_NOMATCH;