summaryrefslogtreecommitdiff
path: root/src/udev/udevd.c
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2014-11-13 20:35:06 +0100
committerKay Sievers <kay@vrfy.org>2014-11-13 20:35:06 +0100
commitadeba5008eac3105ae59256dedd087ebe006a9e6 (patch)
tree5b8dd3f0e7c6e47b560e89fd48f3039e1201a78e /src/udev/udevd.c
parent41b848b0ea674dba135d5d5f82b87d126d967fcf (diff)
udev: support ENV{}=="" global property matches
Diffstat (limited to 'src/udev/udevd.c')
-rw-r--r--src/udev/udevd.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 6335b6c75a..3c3de76f34 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -75,8 +75,8 @@ static sigset_t sigmask_orig;
static UDEV_LIST(event_list);
static UDEV_LIST(worker_list);
static char *udev_cgroup;
-static bool udev_exit;
static struct udev_list properties_list;
+static bool udev_exit;
enum event_state {
EVENT_UNDEF,
@@ -305,9 +305,15 @@ static void worker_new(struct event *event) {
udev_event->rtnl = rtnl;
/* apply rules, create node, symlinks */
- udev_event_execute_rules(udev_event, arg_event_timeout_usec, arg_event_timeout_warn_usec, rules, &sigmask_orig);
-
- udev_event_execute_run(udev_event, arg_event_timeout_usec, arg_event_timeout_warn_usec, &sigmask_orig);
+ udev_event_execute_rules(udev_event,
+ arg_event_timeout_usec, arg_event_timeout_warn_usec,
+ &properties_list,
+ rules,
+ &sigmask_orig);
+
+ udev_event_execute_run(udev_event,
+ arg_event_timeout_usec, arg_event_timeout_warn_usec,
+ &sigmask_orig);
/* in case rtnl was initialized */
rtnl = sd_rtnl_ref(udev_event->rtnl);