]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
namespace: Rename notify_socket to host_notify_socket
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 11 Dec 2024 19:08:38 +0000 (19:08 +0000)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 11 Dec 2024 19:08:38 +0000 (19:08 +0000)
Preparation for next commit.

src/core/exec-invoke.c
src/core/namespace.c
src/core/namespace.h

index fd306f1143125ba442b1739ff37080dae421917c..2c69dda36df06adb5e1860d4d2d7c181657e90fc 100644 (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,
index 2f3b8f03d130892afe0f879129bf384dd1667de3..47b0314485c10dfc9e7d04521db0a8732d15ab60 100644 (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,
                 };
index 96f62be30a2690b033d60f1d617b63ef363c1631..02b0f775632bc1eca5885c89806840347f810b4d 100644 (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;