unit: don't Require systemd-journald.socket from units

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

diff --git a/src/core/unit.c b/src/core/unit.c
index f7d00b6030d2f9a690c8367da86506447347e3e7..3a88996eb7394bfe69c27145bd165f8a24cb07f9 100644 (file)
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -46,6 +46,8 @@
 #include "missing.h"
 #include "cgroup-attr.h"
 #include "mkdir.h"
 #include "missing.h"
 #include "cgroup-attr.h"
 #include "mkdir.h"

+#include "label.h"
+#include "fileio-label.h"

 
 const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX] = {
         [UNIT_SERVICE] = &service_vtable,
 
 const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX] = {
         [UNIT_SERVICE] = &service_vtable,


@@ -614,9 +616,11 @@ int unit_add_exec_dependencies(Unit *u, ExecContext *c) {
         /* If syslog or kernel logging is requested, make sure our own
          * logging daemon is run first. */
 
         /* If syslog or kernel logging is requested, make sure our own
          * logging daemon is run first. */
 

-        if (u->manager->running_as == SYSTEMD_SYSTEM)
-                if ((r = unit_add_two_dependencies_by_name(u, UNIT_REQUIRES, UNIT_AFTER, SPECIAL_JOURNALD_SOCKET, NULL, true)) < 0)
+        if (u->manager->running_as == SYSTEMD_SYSTEM) {
+                r = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_JOURNALD_SOCKET, NULL, true);
+                if (r < 0)

                         return r;
                         return r;

+        }

 
         return 0;
 }
 
         return 0;
 }


@@ -2778,7 +2782,7 @@ int unit_write_drop_in(Unit *u, bool runtime, const char *name, const char *data
                 return -ENOMEM;
 
         mkdir_p(p, 0755);
                 return -ENOMEM;
 
         mkdir_p(p, 0755);

-        return write_one_line_file_atomic(q, data);
+        return write_one_line_file_atomic_label(q, data);

 }
 
 int unit_remove_drop_in(Unit *u, bool runtime, const char *name) {
 }
 
 int unit_remove_drop_in(Unit *u, bool runtime, const char *name) {