Commit 2d13da88 authored by Kay Sievers's avatar Kay Sievers

udev: remove RUN+="socket:.." and udev_monitor_new_from_netlink()

parent 83cd6b75
......@@ -22,7 +22,7 @@ AM_MAKEFLAGS = --no-print-directory
SUBDIRS = . po
LIBUDEV_CURRENT=13
LIBUDEV_REVISION=2
LIBUDEV_REVISION=3
LIBUDEV_AGE=13
LIBGUDEV_CURRENT=1
......
......@@ -6,6 +6,10 @@ CHANGES WITH 182:
* udev: /lib/udev/devices/ are not read anymore; tmpfiles should
be used to create workarounds for broken subsystems.
* udev: RUN+="socket:..." and udev_monitor_new_from_socket() is
no longer supported. udev_monitor_new_from_netlink() needs to be
used to subscribe to events.
* systemd-logingctl and systemd-journalctl have been renamed
to logingctl and journalctl to match systemctl.
......
......@@ -25,13 +25,10 @@ Features:
* udev: scsi_id -> sg3_utils?
* udev: kill /usr/lib/udev/devices/ and use tmpfiles for it
* udev: add trigger --subsystem-match=usb/usb_device
* udev: remove RUN+="socket:"
* udev: libudev.so.1
- remove deprecated symbols
- use symbol versioning
- return object with *_unref()
- kill: udev_monitor_from_socket()
......
This diff is collapsed.
......@@ -114,8 +114,6 @@ void udev_monitor_unref(struct udev_monitor *udev_monitor);
struct udev *udev_monitor_get_udev(struct udev_monitor *udev_monitor);
/* kernel and udev generated events over netlink */
struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev, const char *name);
/* custom socket (use netlink and filters instead) */
struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char *socket_path);
/* bind socket */
int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor);
int udev_monitor_set_receive_buffer_size(struct udev_monitor *udev_monitor, int size);
......@@ -127,6 +125,7 @@ int udev_monitor_filter_add_match_subsystem_devtype(struct udev_monitor *udev_mo
int udev_monitor_filter_add_match_tag(struct udev_monitor *udev_monitor, const char *tag);
int udev_monitor_filter_update(struct udev_monitor *udev_monitor);
int udev_monitor_filter_remove(struct udev_monitor *udev_monitor);
__attribute__((deprecated)) struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char *socket_path);
/*
* udev_enumerate
......
......@@ -956,14 +956,6 @@ void udev_event_execute_run(struct udev_event *event, const sigset_t *sigmask)
udev_event_apply_format(event, cmd, command, sizeof(command));
udev_builtin_run(event->dev, builtin_cmd, command, false);
} else if (strncmp(cmd, "socket:", strlen("socket:")) == 0) {
struct udev_monitor *monitor;
monitor = udev_monitor_new_from_socket(event->udev, &cmd[strlen("socket:")]);
if (monitor == NULL)
continue;
udev_monitor_send_device(monitor, NULL, event->dev);
udev_monitor_unref(monitor);
} else {
char program[UTIL_PATH_SIZE];
char **envp;
......
......@@ -1450,9 +1450,6 @@ static int add_rule(struct udev_rules *rules, char *line,
} else if (strcmp(attr, "program") == 0) {
enum udev_builtin_cmd cmd = UDEV_BUILTIN_MAX;
if (strncmp(value, "socket:", 7) == 0)
log_error("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_PROGRAM, op, value, &cmd);
} else {
log_error("RUN{} unknown type, ignoring RUN %s:%u\n", filename, lineno);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment