summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2012-01-21 03:07:32 +0100
committerKay Sievers <kay.sievers@vrfy.org>2012-01-21 03:07:32 +0100
commit430959910f1b9b67c2553f5f46c0487b0f8a3a00 (patch)
tree3a106a2a6829a81a3a83688dae9e40dc1a001210
parent6102188c93e55eba1b5dad54d27ea1ac2e8c7e73 (diff)
warn about deprecated RUN+="socket:" use
-rw-r--r--src/udev-rules.c3
-rw-r--r--src/udevd.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/udev-rules.c b/src/udev-rules.c
index d14a57abc..c16371286 100644
--- 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 77a1e7909..170221790 100644
--- 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;