From: Luca Boccassi <bluca@debian.org>
Date: Sat, 9 Sep 2023 18:15:46 +0000 (+0100)
Subject: Merge pull request #29130 from poettering/unit-defaults
X-Git-Tag: v255-rc1~534
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd0a80427122c7bca0efb81ecc7ec11a483b4e6c;p=thirdparty%2Fsystemd.git

Merge pull request #29130 from poettering/unit-defaults

core: introduce UnitDefaults structure for unit defaults
---

fd0a80427122c7bca0efb81ecc7ec11a483b4e6c
diff --cc src/core/socket.c
index a485db67c53,0603b9337e0..9e7809721af
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@@ -94,10 -94,9 +94,10 @@@ static void socket_init(Unit *u) 
          s->ip_ttl = -1;
          s->mark = -1;
  
-         s->exec_context.std_output = u->manager->default_std_output;
-         s->exec_context.std_error = u->manager->default_std_error;
+         s->exec_context.std_output = u->manager->defaults.std_output;
+         s->exec_context.std_error = u->manager->defaults.std_error;
  
 +        s->control_pid = PIDREF_NULL;
          s->control_command_id = _SOCKET_EXEC_COMMAND_INVALID;
  
          s->trigger_limit.interval = USEC_INFINITY;
diff --cc src/core/swap.c
index c467008fb2f,4772b5e9fc5..c6b5f3471a2
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@@ -139,12 -139,11 +139,12 @@@ static void swap_init(Unit *u) 
          assert(s);
          assert(UNIT(s)->load_state == UNIT_STUB);
  
-         s->timeout_usec = u->manager->default_timeout_start_usec;
+         s->timeout_usec = u->manager->defaults.timeout_start_usec;
  
-         s->exec_context.std_output = u->manager->default_std_output;
-         s->exec_context.std_error = u->manager->default_std_error;
+         s->exec_context.std_output = u->manager->defaults.std_output;
+         s->exec_context.std_error = u->manager->defaults.std_error;
  
 +        s->control_pid = PIDREF_NULL;
          s->control_command_id = _SWAP_EXEC_COMMAND_INVALID;
  
          u->ignore_on_isolate = true;