warn about deprecated RUN+="socket:" use

diff --git a/src/udev-rules.c b/src/udev-rules.c
index d14a57abc7d302ec332e8e8ca8fc8aa709a6fdad..c163712868244c032be1956ac58a8692113cd9e1 100644 (file)
--- a/src/udev-rules.c
+++ b/src/udev-rules.c
@@ -1451,6 +1451,9 @@ static int add_rule(struct udev_rules *rules, char *line,
                 }
 
                 if (strcmp(key, "RUN") == 0) {
+                        if (strncmp(value, "socket:", 7) == 0)
+                                err(rules->udev, "RUN+=\"socket:...\" support will be removed from a future udev release. "
+                                    "Please remove it from: %s:%u and use libudev to subscribe to events.\n", filename, lineno);
                         rule_add_key(&rule_tmp, TK_A_RUN, op, value, NULL);
                         continue;
                 }

diff --git a/src/udevd.c b/src/udevd.c
index 77a1e7909db6dd3f2bb38e65c5af97d390c29798..170221790abe95828a34bafab7623c11fcb87c8c 100644 (file)
--- a/src/udevd.c
+++ b/src/udevd.c
@@ -230,7 +230,7 @@ static void worker_new(struct event *event)
                 sigset_t mask;
                 int rc = EXIT_SUCCESS;
 
-                /* move initial device from queue */
+                /* take initial device from queue */
                 dev = event->dev;
                 event->dev = NULL;