SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udev: drop home-grown udev-ctrl socket (#40802)

Browse Source 
Nowadays, varlink is used to control systemd-udevd. Let's drop the
legacy socket.

Note, the existence of /run/udev/control socket is widely used in both
our code and external projects. Also, the dependency to
systemd-udevd-control.socket is widely used in many projects. Hence, we
need to create a symlink to the socket file and .socket unit file.
This commit is contained in:
Luca Boccassi
2026-07-20 12:37:27 +01:00
committed by GitHub
parent 79f25def86 368eb65155
commit e304d559e8
31 changed files with 88 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nspawn/nspawn.c
+9 -18
View File
@@ -129,6 +129,7 @@
#include "sysctl-util.h"
#include "terminal-util.h"
#include "tmpfile-util.h"
#include "udev-util.h"
#include "uid-classification.h"
#include "umask-util.h"
#include "unit-name.h"
@@ -6045,8 +6046,6 @@ static int initialize_rlimits(void) {
}
static int cant_be_in_netns(void) {
_cleanup_close_ int fd = -EBADF;
struct ucred ucred;
int r;
/* Check if we are in the same netns as udev. If we aren't, then device monitoring (and thus waiting
@@ -6056,28 +6055,20 @@ static int cant_be_in_netns(void) {
if (!arg_image) /* only matters if --image= us used, i.e. we actually need to use loopback devices */
return 0;
fd = socket(AF_UNIX, SOCK_SEQPACKET|SOCK_NONBLOCK|SOCK_CLOEXEC, 0);
if (fd < 0)
return log_error_errno(errno, "Failed to allocate udev control socket: %m");
if (arg_userns_mode == USER_NAMESPACE_MANAGED)
return 0;
r = connect_unix_path(fd, AT_FDCWD, "/run/udev/control");
if (r == -ENOENT || ERRNO_IS_NEG_DISCONNECT(r))
if (!udev_available())
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
"Sorry, but --image= requires access to the host's /run/ hierarchy, since we need access to udev.");
"Sorry, but --image= requires that systemd-udevd is available.");
r = namespace_is_init(NAMESPACE_NET);
if (ERRNO_IS_NEG_PRIVILEGE(r)) {
log_debug_errno(r, "Can't connect to udev control socket, assuming we are in same netns.");
log_debug_errno(r, "Failed to check if we are in the main network namespace, assuming so, ignoring: %m");
return 0;
}
if (r < 0)
return log_error_errno(r, "Failed to connect socket to udev control socket: %m");
r = getpeercred(fd, &ucred);
if (r < 0)
return log_error_errno(r, "Failed to determine peer of udev control socket: %m");
r = in_same_namespace(ucred.pid, 0, NAMESPACE_NET);
if (r < 0)
return log_error_errno(r, "Failed to determine network namespace of udev: %m");
return log_error_errno(r, "Failed to check if we are in the main network namespace: %m");
if (r == 0)
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
"Sorry, but --image= is only supported in the main network namespace, since we need access to udev/AF_NETLINK.");