From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 11 Dec 2024 19:08:38 +0000 (+0000)
Subject: namespace: Rename notify_socket to host_notify_socket
X-Git-Tag: v258-rc1~1870^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15816441ca4c949b4cfe6aaf31f6e8e7fa432b10;p=thirdparty%2Fsystemd.git

namespace: Rename notify_socket to host_notify_socket

Preparation for next commit.
---

diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c
index fd306f11431..2c69dda36df 100644
--- a/src/core/exec-invoke.c
+++ b/src/core/exec-invoke.c
@@ -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,
diff --git a/src/core/namespace.c b/src/core/namespace.c
index 2f3b8f03d13..47b0314485c 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -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,
                 };
diff --git a/src/core/namespace.h b/src/core/namespace.h
index 96f62be30a2..02b0f775632 100644
--- a/src/core/namespace.h
+++ b/src/core/namespace.h
@@ -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;