Merge pull request #29130 from poettering/unit-defaults

core: introduce UnitDefaults structure for unit defaults

diff --cc src/core/mount.c
Simple merge

diff --cc src/core/service.c
Simple merge

diff --cc src/core/socket.c
index a485db67c531ef042c76339185558556e68250e7,0603b9337e0d1f2ce5d8b112a6b05a560bde8d4e..9e7809721afd35fba6c18791f0f6e3cd5b51b349
--- 1/src/core/socket.c
--- 2/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 c467008fb2f09ccb87a799810f1a23c2610221e6,4772b5e9fc59d19ec4629873d9a0781d04e89b79..c6b5f3471a26e303bb0074a0f6e30d18b24861ea
--- 1/src/core/swap.c
--- 2/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;