Merge pull request #10094 from keszybz/wants-loading

Fix bogus fragment paths in units in .wants/.requires

diff --combined src/core/service.c
index 778bce832e6622208f53368b8395cea8af76ee48,372339af43c378dd3a3b67034535b0eb6227bc57..3d065bf487ce9821faf1618adf629d8323b138c0
--- 1/src/core/service.c
--- 2/src/core/service.c
+++ b/src/core/service.c
@@@ -48,7 -48,7 +48,7 @@@ static const UnitActiveState state_tran
          [SERVICE_EXITED] = UNIT_ACTIVE,
          [SERVICE_RELOAD] = UNIT_RELOADING,
          [SERVICE_STOP] = UNIT_DEACTIVATING,
 -        [SERVICE_STOP_SIGABRT] = UNIT_DEACTIVATING,
 +        [SERVICE_STOP_WATCHDOG] = UNIT_DEACTIVATING,
          [SERVICE_STOP_SIGTERM] = UNIT_DEACTIVATING,
          [SERVICE_STOP_SIGKILL] = UNIT_DEACTIVATING,
          [SERVICE_STOP_POST] = UNIT_DEACTIVATING,
@@@ -69,7 -69,7 +69,7 @@@ static const UnitActiveState state_tran
          [SERVICE_EXITED] = UNIT_ACTIVE,
          [SERVICE_RELOAD] = UNIT_RELOADING,
          [SERVICE_STOP] = UNIT_DEACTIVATING,
 -        [SERVICE_STOP_SIGABRT] = UNIT_DEACTIVATING,
 +        [SERVICE_STOP_WATCHDOG] = UNIT_DEACTIVATING,
          [SERVICE_STOP_SIGTERM] = UNIT_DEACTIVATING,
          [SERVICE_STOP_SIGKILL] = UNIT_DEACTIVATING,
          [SERVICE_STOP_POST] = UNIT_DEACTIVATING,
@@@ -609,7 -609,7 +609,7 @@@ static int service_add_default_dependen
                   * require it, so that we fail if we can't acquire
                   * it. */
  
-                 r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true, UNIT_DEPENDENCY_DEFAULT);
+                 r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, true, UNIT_DEPENDENCY_DEFAULT);
                  if (r < 0)
                          return r;
          } else {
@@@ -617,7 -617,7 +617,7 @@@
                  /* In the --user instance there's no sysinit.target,
                   * in that case require basic.target instead. */
  
-                 r = unit_add_dependency_by_name(UNIT(s), UNIT_REQUIRES, SPECIAL_BASIC_TARGET, NULL, true, UNIT_DEPENDENCY_DEFAULT);
+                 r = unit_add_dependency_by_name(UNIT(s), UNIT_REQUIRES, SPECIAL_BASIC_TARGET, true, UNIT_DEPENDENCY_DEFAULT);
                  if (r < 0)
                          return r;
          }
@@@ -625,12 -625,12 +625,12 @@@
          /* Second, if the rest of the base system is in the same
           * transaction, order us after it, but do not pull it in or
           * even require it. */
-         r = unit_add_dependency_by_name(UNIT(s), UNIT_AFTER, SPECIAL_BASIC_TARGET, NULL, true, UNIT_DEPENDENCY_DEFAULT);
+         r = unit_add_dependency_by_name(UNIT(s), UNIT_AFTER, SPECIAL_BASIC_TARGET, true, UNIT_DEPENDENCY_DEFAULT);
          if (r < 0)
                  return r;
  
          /* Third, add us in for normal shutdown. */
-         return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true, UNIT_DEPENDENCY_DEFAULT);
+         return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, true, UNIT_DEPENDENCY_DEFAULT);
  }
  
  static void service_fix_output(Service *s) {
@@@ -661,12 -661,12 +661,12 @@@ static int service_setup_bus_name(Servi
          if (!s->bus_name)
                  return 0;
  
-         r = unit_add_dependency_by_name(UNIT(s), UNIT_REQUIRES, SPECIAL_DBUS_SOCKET, NULL, true, UNIT_DEPENDENCY_FILE);
+         r = unit_add_dependency_by_name(UNIT(s), UNIT_REQUIRES, SPECIAL_DBUS_SOCKET, true, UNIT_DEPENDENCY_FILE);
          if (r < 0)
                  return log_unit_error_errno(UNIT(s), r, "Failed to add dependency on " SPECIAL_DBUS_SOCKET ": %m");
  
          /* We always want to be ordered against dbus.socket if both are in the transaction. */
-         r = unit_add_dependency_by_name(UNIT(s), UNIT_AFTER, SPECIAL_DBUS_SOCKET, NULL, true, UNIT_DEPENDENCY_FILE);
+         r = unit_add_dependency_by_name(UNIT(s), UNIT_AFTER, SPECIAL_DBUS_SOCKET, true, UNIT_DEPENDENCY_FILE);
          if (r < 0)
                  return log_unit_error_errno(UNIT(s), r, "Failed to add dependency on " SPECIAL_DBUS_SOCKET ": %m");
  
@@@ -1031,7 -1031,7 +1031,7 @@@ static void service_set_state(Service *
                      SERVICE_START_PRE, SERVICE_START, SERVICE_START_POST,
                      SERVICE_RUNNING,
                      SERVICE_RELOAD,
 -                    SERVICE_STOP, SERVICE_STOP_SIGABRT, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL, SERVICE_STOP_POST,
 +                    SERVICE_STOP, SERVICE_STOP_WATCHDOG, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL, SERVICE_STOP_POST,
                      SERVICE_FINAL_SIGTERM, SERVICE_FINAL_SIGKILL,
                      SERVICE_AUTO_RESTART))
                  s->timer_event_source = sd_event_source_unref(s->timer_event_source);
@@@ -1039,7 -1039,7 +1039,7 @@@
          if (!IN_SET(state,
                      SERVICE_START, SERVICE_START_POST,
                      SERVICE_RUNNING, SERVICE_RELOAD,
 -                    SERVICE_STOP, SERVICE_STOP_SIGABRT, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL, SERVICE_STOP_POST,
 +                    SERVICE_STOP, SERVICE_STOP_WATCHDOG, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL, SERVICE_STOP_POST,
                      SERVICE_FINAL_SIGTERM, SERVICE_FINAL_SIGKILL)) {
                  service_unwatch_main_pid(s);
                  s->main_command = NULL;
@@@ -1048,7 -1048,7 +1048,7 @@@
          if (!IN_SET(state,
                      SERVICE_START_PRE, SERVICE_START, SERVICE_START_POST,
                      SERVICE_RELOAD,
 -                    SERVICE_STOP, SERVICE_STOP_SIGABRT, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL, SERVICE_STOP_POST,
 +                    SERVICE_STOP, SERVICE_STOP_WATCHDOG, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL, SERVICE_STOP_POST,
                      SERVICE_FINAL_SIGTERM, SERVICE_FINAL_SIGKILL)) {
                  service_unwatch_control_pid(s);
                  s->control_command = NULL;
@@@ -1063,7 -1063,7 +1063,7 @@@
          if (!IN_SET(state,
                      SERVICE_START_PRE, SERVICE_START, SERVICE_START_POST,
                      SERVICE_RUNNING, SERVICE_RELOAD,
 -                    SERVICE_STOP, SERVICE_STOP_SIGABRT, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL, SERVICE_STOP_POST,
 +                    SERVICE_STOP, SERVICE_STOP_WATCHDOG, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL, SERVICE_STOP_POST,
                      SERVICE_FINAL_SIGTERM, SERVICE_FINAL_SIGKILL) &&
              !(state == SERVICE_DEAD && UNIT(s)->job))
                  service_close_socket_fd(s);
@@@ -1102,7 -1102,7 +1102,7 @@@ static usec_t service_coldplug_timeout(
                  return usec_add(UNIT(s)->active_enter_timestamp.monotonic, s->runtime_max_usec);
  
          case SERVICE_STOP:
 -        case SERVICE_STOP_SIGABRT:
 +        case SERVICE_STOP_WATCHDOG:
          case SERVICE_STOP_SIGTERM:
          case SERVICE_STOP_SIGKILL:
          case SERVICE_STOP_POST:
@@@ -1137,7 -1137,7 +1137,7 @@@ static int service_coldplug(Unit *u) 
              (IN_SET(s->deserialized_state,
                      SERVICE_START, SERVICE_START_POST,
                      SERVICE_RUNNING, SERVICE_RELOAD,
 -                    SERVICE_STOP, SERVICE_STOP_SIGABRT, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL, SERVICE_STOP_POST,
 +                    SERVICE_STOP, SERVICE_STOP_WATCHDOG, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL, SERVICE_STOP_POST,
                      SERVICE_FINAL_SIGTERM, SERVICE_FINAL_SIGKILL))) {
                  r = unit_watch_pid(UNIT(s), s->main_pid);
                  if (r < 0)
@@@ -1149,7 -1149,7 +1149,7 @@@
              IN_SET(s->deserialized_state,
                     SERVICE_START_PRE, SERVICE_START, SERVICE_START_POST,
                     SERVICE_RELOAD,
 -                   SERVICE_STOP, SERVICE_STOP_SIGABRT, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL, SERVICE_STOP_POST,
 +                   SERVICE_STOP, SERVICE_STOP_WATCHDOG, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL, SERVICE_STOP_POST,
                     SERVICE_FINAL_SIGTERM, SERVICE_FINAL_SIGKILL)) {
                  r = unit_watch_pid(UNIT(s), s->control_pid);
                  if (r < 0)
@@@ -1780,8 -1780,8 +1780,8 @@@ fail
  static int state_to_kill_operation(ServiceState state) {
          switch (state) {
  
 -        case SERVICE_STOP_SIGABRT:
 -                return KILL_ABORT;
 +        case SERVICE_STOP_WATCHDOG:
 +                return KILL_WATCHDOG;
  
          case SERVICE_STOP_SIGTERM:
          case SERVICE_FINAL_SIGTERM:
@@@ -1827,9 -1827,9 +1827,9 @@@ static void service_enter_signal(Servic
                          goto fail;
  
                  service_set_state(s, state);
 -        } else if (IN_SET(state, SERVICE_STOP_SIGABRT, SERVICE_STOP_SIGTERM) && s->kill_context.send_sigkill)
 +        } else if (IN_SET(state, SERVICE_STOP_WATCHDOG, SERVICE_STOP_SIGTERM) && s->kill_context.send_sigkill)
                  service_enter_signal(s, SERVICE_STOP_SIGKILL, SERVICE_SUCCESS);
 -        else if (IN_SET(state, SERVICE_STOP_SIGABRT, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL))
 +        else if (IN_SET(state, SERVICE_STOP_WATCHDOG, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL))
                  service_enter_stop_post(s, SERVICE_SUCCESS);
          else if (state == SERVICE_FINAL_SIGTERM && s->kill_context.send_sigkill)
                  service_enter_signal(s, SERVICE_FINAL_SIGKILL, SERVICE_SUCCESS);
@@@ -1841,7 -1841,7 +1841,7 @@@
  fail:
          log_unit_warning_errno(UNIT(s), r, "Failed to kill processes: %m");
  
 -        if (IN_SET(state, SERVICE_STOP_SIGABRT, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL))
 +        if (IN_SET(state, SERVICE_STOP_WATCHDOG, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL))
                  service_enter_stop_post(s, SERVICE_FAILURE_RESOURCES);
          else
                  service_enter_dead(s, SERVICE_FAILURE_RESOURCES, true);
@@@ -2291,7 -2291,7 +2291,7 @@@ static int service_start(Unit *u) 
          /* We cannot fulfill this request right now, try again later
           * please! */
          if (IN_SET(s->state,
 -                   SERVICE_STOP, SERVICE_STOP_SIGABRT, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL, SERVICE_STOP_POST,
 +                   SERVICE_STOP, SERVICE_STOP_WATCHDOG, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL, SERVICE_STOP_POST,
                     SERVICE_FINAL_SIGTERM, SERVICE_FINAL_SIGKILL))
                  return -EAGAIN;
  
@@@ -2361,7 -2361,7 +2361,7 @@@ static int service_stop(Unit *u) 
  
          /* Already on it */
          if (IN_SET(s->state,
 -                   SERVICE_STOP, SERVICE_STOP_SIGABRT, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL, SERVICE_STOP_POST,
 +                   SERVICE_STOP, SERVICE_STOP_WATCHDOG, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL, SERVICE_STOP_POST,
                     SERVICE_FINAL_SIGTERM, SERVICE_FINAL_SIGKILL))
                  return 0;
  
@@@ -3130,7 -3130,7 +3130,7 @@@ static void service_notify_cgroup_empty
                  service_enter_running(s, SERVICE_SUCCESS);
                  break;
  
 -        case SERVICE_STOP_SIGABRT:
 +        case SERVICE_STOP_WATCHDOG:
          case SERVICE_STOP_SIGTERM:
          case SERVICE_STOP_SIGKILL:
  
@@@ -3274,7 -3274,7 +3274,7 @@@ static void service_sigchld_event(Unit 
                                  service_enter_running(s, f);
                                  break;
  
 -                        case SERVICE_STOP_SIGABRT:
 +                        case SERVICE_STOP_WATCHDOG:
                          case SERVICE_STOP_SIGTERM:
                          case SERVICE_STOP_SIGKILL:
  
@@@ -3409,7 -3409,7 +3409,7 @@@
                                  service_enter_signal(s, SERVICE_STOP_SIGTERM, f);
                                  break;
  
 -                        case SERVICE_STOP_SIGABRT:
 +                        case SERVICE_STOP_WATCHDOG:
                          case SERVICE_STOP_SIGTERM:
                          case SERVICE_STOP_SIGKILL:
                                  if (main_pid_good(s) <= 0)
@@@ -3480,8 -3480,8 +3480,8 @@@ static int service_dispatch_timer(sd_ev
                  service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_FAILURE_TIMEOUT);
                  break;
  
 -        case SERVICE_STOP_SIGABRT:
 -                log_unit_warning(UNIT(s), "State 'stop-sigabrt' timed out. Terminating.");
 +        case SERVICE_STOP_WATCHDOG:
 +                log_unit_warning(UNIT(s), "State 'stop-watchdog' timed out. Terminating.");
                  service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_FAILURE_TIMEOUT);
                  break;
  
@@@ -3560,7 -3560,7 +3560,7 @@@ static int service_dispatch_watchdog(sd
                  log_unit_error(UNIT(s), "Watchdog timeout (limit %s)!",
                                 format_timespan(t, sizeof(t), watchdog_usec, 1));
  
 -                service_enter_signal(s, SERVICE_STOP_SIGABRT, SERVICE_FAILURE_WATCHDOG);
 +                service_enter_signal(s, SERVICE_STOP_WATCHDOG, SERVICE_FAILURE_WATCHDOG);
          } else
                  log_unit_warning(UNIT(s), "Watchdog disabled! Ignoring watchdog timeout (limit %s)!",
                                   format_timespan(t, sizeof(t), watchdog_usec, 1));
@@@ -3967,7 -3967,7 +3967,7 @@@ static bool service_needs_console(Unit 
                        SERVICE_RUNNING,
                        SERVICE_RELOAD,
                        SERVICE_STOP,
 -                      SERVICE_STOP_SIGABRT,
 +                      SERVICE_STOP_WATCHDOG,
                        SERVICE_STOP_SIGTERM,
                        SERVICE_STOP_SIGKILL,
                        SERVICE_STOP_POST,

diff --combined src/core/socket.c
index aac80f3548eb304ff9aa06f8c8e345e7413dcaf6,395864f5ac1d8c03ca3f49ffc2134d1187551d95..649904d4062715ec7c69619867588d267622efc7
--- 1/src/core/socket.c
--- 2/src/core/socket.c
+++ b/src/core/socket.c
@@@ -301,17 -301,17 +301,17 @@@ static int socket_add_default_dependenc
          if (!UNIT(s)->default_dependencies)
                  return 0;
  
-         r = unit_add_dependency_by_name(UNIT(s), UNIT_BEFORE, SPECIAL_SOCKETS_TARGET, NULL, true, UNIT_DEPENDENCY_DEFAULT);
+         r = unit_add_dependency_by_name(UNIT(s), UNIT_BEFORE, SPECIAL_SOCKETS_TARGET, true, UNIT_DEPENDENCY_DEFAULT);
          if (r < 0)
                  return r;
  
          if (MANAGER_IS_SYSTEM(UNIT(s)->manager)) {
-                 r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true, UNIT_DEPENDENCY_DEFAULT);
+                 r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, true, UNIT_DEPENDENCY_DEFAULT);
                  if (r < 0)
                          return r;
          }
  
-         return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true, UNIT_DEPENDENCY_DEFAULT);
+         return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, true, UNIT_DEPENDENCY_DEFAULT);
  }
  
  _pure_ static bool socket_has_exec(Socket *s) {
@@@ -1313,7 -1313,7 +1313,7 @@@ static int socket_symlink(Socket *s) 
          STRV_FOREACH(i, s->symlinks) {
                  (void) mkdir_parents_label(*i, s->directory_mode);
  
 -                r = symlink_idempotent(p, *i);
 +                r = symlink_idempotent(p, *i, false);
  
                  if (r == -EEXIST && s->remove_on_stop) {
                          /* If there's already something where we want to create the symlink, and the destructive
@@@ -1321,7 -1321,7 +1321,7 @@@
                           * again. */
  
                          if (unlink(*i) >= 0)
 -                                r = symlink_idempotent(p, *i);
 +                                r = symlink_idempotent(p, *i, false);
                  }
  
                  if (r < 0)

diff --combined src/core/unit.c
index 5817fc1637431a79d74e097f51eaa51a9235048f,65711bbc81f453b14fe2260c28768e71109e804d..723efbbdbcc7a3a7def78422c103819a2ee97194
--- 1/src/core/unit.c
--- 2/src/core/unit.c
+++ b/src/core/unit.c
@@@ -1009,7 -1009,7 +1009,7 @@@ int unit_add_exec_dependencies(Unit *u
                                  return r;
                  }
  
-                 r = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_TMPFILES_SETUP_SERVICE, NULL, true, UNIT_DEPENDENCY_FILE);
+                 r = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_TMPFILES_SETUP_SERVICE, true, UNIT_DEPENDENCY_FILE);
                  if (r < 0)
                          return r;
          }
@@@ -1027,7 -1027,7 +1027,7 @@@
          /* If syslog or kernel logging is requested, make sure our own
           * logging daemon is run first. */
  
-         r = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_JOURNALD_SOCKET, NULL, true, UNIT_DEPENDENCY_FILE);
+         r = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_JOURNALD_SOCKET, true, UNIT_DEPENDENCY_FILE);
          if (r < 0)
                  return r;
  
@@@ -1398,7 -1398,7 +1398,7 @@@ static int unit_add_slice_dependencies(
          if (unit_has_name(u, SPECIAL_ROOT_SLICE))
                  return 0;
  
-         return unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_REQUIRES, SPECIAL_ROOT_SLICE, NULL, true, mask);
+         return unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_REQUIRES, SPECIAL_ROOT_SLICE, true, mask);
  }
  
  static int unit_add_mount_dependencies(Unit *u) {
@@@ -2894,17 -2894,14 +2894,14 @@@ int unit_add_two_dependencies(Unit *u, 
          return unit_add_dependency(u, e, other, add_reference, mask);
  }
  
- static int resolve_template(Unit *u, const char *name, const char*path, char **buf, const char **ret) {
+ static int resolve_template(Unit *u, const char *name, char **buf, const char **ret) {
          int r;
  
          assert(u);
-         assert(name || path);
+         assert(name);
          assert(buf);
          assert(ret);
  
-         if (!name)
-                 name = basename(path);
- 
          if (!unit_name_is_valid(name, UNIT_NAME_TEMPLATE)) {
                  *buf = NULL;
                  *ret = name;
@@@ -2929,38 -2926,38 +2926,38 @@@
          return 0;
  }
  
- int unit_add_dependency_by_name(Unit *u, UnitDependency d, const char *name, const char *path, bool add_reference, UnitDependencyMask mask) {
+ int unit_add_dependency_by_name(Unit *u, UnitDependency d, const char *name, bool add_reference, UnitDependencyMask mask) {
          _cleanup_free_ char *buf = NULL;
          Unit *other;
          int r;
  
          assert(u);
-         assert(name || path);
+         assert(name);
  
-         r = resolve_template(u, name, path, &buf, &name);
+         r = resolve_template(u, name, &buf, &name);
          if (r < 0)
                  return r;
  
-         r = manager_load_unit(u->manager, name, path, NULL, &other);
+         r = manager_load_unit(u->manager, name, NULL, NULL, &other);
          if (r < 0)
                  return r;
  
          return unit_add_dependency(u, d, other, add_reference, mask);
  }
  
- int unit_add_two_dependencies_by_name(Unit *u, UnitDependency d, UnitDependency e, const char *name, const char *path, bool add_reference, UnitDependencyMask mask) {
+ int unit_add_two_dependencies_by_name(Unit *u, UnitDependency d, UnitDependency e, const char *name, bool add_reference, UnitDependencyMask mask) {
          _cleanup_free_ char *buf = NULL;
          Unit *other;
          int r;
  
          assert(u);
-         assert(name || path);
+         assert(name);
  
-         r = resolve_template(u, name, path, &buf, &name);
+         r = resolve_template(u, name, &buf, &name);
          if (r < 0)
                  return r;
  
-         r = manager_load_unit(u->manager, name, path, NULL, &other);
+         r = manager_load_unit(u->manager, name, NULL, NULL, &other);
          if (r < 0)
                  return r;
  
@@@ -4509,8 -4506,8 +4506,8 @@@ static int operation_to_signal(KillCont
          case KILL_KILL:
                  return c->final_kill_signal;
  
 -        case KILL_ABORT:
 -                return SIGABRT;
 +        case KILL_WATCHDOG:
 +                return c->watchdog_signal;
  
          default:
                  assert_not_reached("KillOperation unknown");

diff --combined src/core/unit.h
index 861a2c1746c19f03d35fe6c682c204b260729d47,7a2eeb5ce2b0237e747cb2d1d498b53c3c17f0d0..2c2819f38e26c7181893fe4d405fcb4ca949efc1
--- 1/src/core/unit.h
--- 2/src/core/unit.h
+++ b/src/core/unit.h
@@@ -19,7 -19,7 +19,7 @@@ typedef enum KillOperation 
          KILL_TERMINATE,
          KILL_TERMINATE_AND_LOG,
          KILL_KILL,
 -        KILL_ABORT,
 +        KILL_WATCHDOG,
          _KILL_OPERATION_MAX,
          _KILL_OPERATION_INVALID = -1
  } KillOperation;
@@@ -602,8 -602,8 +602,8 @@@ int unit_add_name(Unit *u, const char *
  int unit_add_dependency(Unit *u, UnitDependency d, Unit *other, bool add_reference, UnitDependencyMask mask);
  int unit_add_two_dependencies(Unit *u, UnitDependency d, UnitDependency e, Unit *other, bool add_reference, UnitDependencyMask mask);
  
- int unit_add_dependency_by_name(Unit *u, UnitDependency d, const char *name, const char *filename, bool add_reference, UnitDependencyMask mask);
- int unit_add_two_dependencies_by_name(Unit *u, UnitDependency d, UnitDependency e, const char *name, const char *path, bool add_reference, UnitDependencyMask mask);
+ int unit_add_dependency_by_name(Unit *u, UnitDependency d, const char *name, bool add_reference, UnitDependencyMask mask);
+ int unit_add_two_dependencies_by_name(Unit *u, UnitDependency d, UnitDependency e, const char *name, bool add_reference, UnitDependencyMask mask);
  
  int unit_add_exec_dependencies(Unit *u, ExecContext *c);