vconsole: don't parse Fedora's KEYMAP= kernel parameters anymore

[elogind.git] / src / service.c

diff --git a/src/service.c b/src/service.c
index 2b45ecb71547f5d3d21d328c2b7843f76253a9b9..c2053ce3ac45e8d829bc232e28c52e4e61f748a2 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -1145,6 +1145,8 @@ static int service_load(Unit *u) {
 
         /* This is a new unit? Then let's add in some extras */
         if (u->meta.load_state == UNIT_LOADED) {
+                service_fix_output(s);
+
                 if ((r = unit_add_exec_dependencies(u, &s->exec_context)) < 0)
                         return r;
 
@@ -1173,8 +1175,6 @@ static int service_load(Unit *u) {
                 if (s->meta.default_dependencies)
                         if ((r = service_add_default_dependencies(s)) < 0)
                                 return r;
-
-                service_fix_output(s);
         }
 
         return service_verify(s);
@@ -3115,7 +3115,7 @@ static int service_enumerate(Manager *m) {
 
                                 free(fpath);
                                 fpath = join(path, "/", de->d_name, NULL);
-                                if (!path) {
+                                if (!fpath) {
                                         r = -ENOMEM;
                                         goto finish;
                                 }