shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-08 08:58:27 +03:00
Code

namespace: Rename notify_socket to host_notify_socket

Browse Source 
Preparation for next commit.
This commit is contained in:
Daan De Meyer 2024-12-11 19:08:38 +00:00
parent 446d737cba
commit 15816441ca
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/exec-invoke.c
View File

@ -3407,7 +3407,7 @@ static int apply_mount_namespace(
.propagate_dir = propagate_dir,
.incoming_dir = incoming_dir,
.private_namespace_dir = private_namespace_dir,
.notify_socket = root_dir || root_image ? params->notify_socket : NULL,
.host_notify_socket = root_dir || root_image ? params->notify_socket : NULL,
.host_os_release_stage = host_os_release_stage,
/* If DynamicUser=no and RootDirectory= is set then lets pass a relaxed sandbox info,

6
src/core/namespace.c
View File

@ -2752,14 +2752,14 @@ int setup_namespace(const NamespaceParameters *p, char **reterr_path) {
};
}
if (p->notify_socket) {
if (p->host_notify_socket) {
MountEntry *me = mount_list_extend(&ml);
if (!me)
return log_oom_debug();
*me = (MountEntry) {
.path_const = p->notify_socket,
.source_const = p->notify_socket,
.path_const = p->host_notify_socket,
.source_const = p->host_notify_socket,
.mode = MOUNT_BIND,
.read_only = true,
};

2
src/core/namespace.h
View File

@ -173,7 +173,7 @@ struct NamespaceParameters {
const char *incoming_dir;
const char *private_namespace_dir;
const char *notify_socket;
const char *host_notify_socket;
const char *host_os_release_stage;
bool ignore_protect_paths;