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

Merge pull request #31886 from DaanDeMeyer/logind

Browse Source 
logind: Add fallback for when the PIDFDs= property is not available
This commit is contained in:
Mike Yuan
2024-03-24 19:19:12 +08:00
committed by GitHub
parent 9c5b5d01f9 66b574b0a2
commit 8e1a1caa9c
9 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nspawn/nspawn-register.c
+5 -8
View File
@@ -297,15 +297,12 @@ int allocate_scope(
description = strjoina("Container ", machine_name);
if (allow_pidfd) {
_cleanup_(pidref_done) PidRef pidref = PIDREF_NULL;
r = pidref_set_pid(&pidref, pid);
if (r < 0)
return log_error_errno(r, "Failed to allocate PID reference: %m");
_cleanup_(pidref_done) PidRef pidref = PIDREF_NULL;
r = pidref_set_pid(&pidref, pid);
if (r < 0)
return log_error_errno(r, "Failed to allocate PID reference: %m");
r = bus_append_scope_pidref(m, &pidref);
} else
r = sd_bus_message_append(m, "(sv)", "PIDs", "au", 1, (uint32_t) pid);
r = bus_append_scope_pidref(m, &pidref, allow_pidfd);
if (r < 0)
return bus_log_create_error(r);