Revert "keymap: add --version option"

[elogind.git] / src / core / socket.c

diff --git a/src/core/socket.c b/src/core/socket.c
index 633663e7e0018f19a176a64aa6765e33b4b54078..8153a8e76206b8093f2f28a66dde398ed780c597 100644 (file)
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -372,6 +372,10 @@ static int socket_load(Unit *u) {
                 if (UNIT(s)->default_dependencies)
                         if ((r = socket_add_default_dependencies(s)) < 0)
                                 return r;
+
+                r = unit_patch_working_directory(UNIT(s), &s->exec_context);
+                if (r < 0)
+                        return r;
         }
 
         return socket_verify(s);
@@ -1153,6 +1157,7 @@ static int socket_spawn(Socket *s, ExecCommand *c, pid_t *_pid) {
                        UNIT(s)->cgroup_bondings,
                        UNIT(s)->cgroup_attributes,
                        NULL,
+                       UNIT(s)->id,
                        NULL,
                        &pid);
 
@@ -2184,7 +2189,6 @@ static const char* const socket_result_table[_SOCKET_RESULT_MAX] = {
 DEFINE_STRING_TABLE_LOOKUP(socket_result, SocketResult);
 
 const UnitVTable socket_vtable = {
-        .suffix = ".socket",
         .object_size = sizeof(Socket),
         .sections =
                 "Unit\0"