From 5cc4112e6d326436dab7476ccc17588d42bf782f Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Sun, 9 Oct 2011 22:52:03 +0200 Subject: udevadm: control - use /run/udev/control socket instead of abstract namespace one --- udev/udevd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'udev/udevd.c') diff --git a/udev/udevd.c b/udev/udevd.c index b65b53f7ed..fdb3e42002 100644 --- a/udev/udevd.c +++ b/udev/udevd.c @@ -1349,7 +1349,7 @@ int main(int argc, char *argv[]) if (systemd_fds(udev, &fd_ctrl, &fd_netlink) >= 0) { /* get control and netlink socket from from systemd */ - udev_ctrl = udev_ctrl_new_from_socket_fd(udev, UDEV_CTRL_SOCK_PATH, fd_ctrl); + udev_ctrl = udev_ctrl_new_from_fd(udev, fd_ctrl); if (udev_ctrl == NULL) { err(udev, "error taking over udev control socket"); rc = 1; @@ -1364,7 +1364,7 @@ int main(int argc, char *argv[]) } } else { /* open control and netlink socket */ - udev_ctrl = udev_ctrl_new_from_socket(udev, UDEV_CTRL_SOCK_PATH); + udev_ctrl = udev_ctrl_new(udev); if (udev_ctrl == NULL) { fprintf(stderr, "error initializing udev control socket"); err(udev, "error initializing udev control socket"); -- cgit v1.2.3-54-g00ecf