X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fservice.c;h=0234151700e9fa696bec35d31cc82629bc6b897b;hb=b6a7b0890ea7d4625e31fa5f413cc94b13660d91;hp=0b54e5bfcfb760d6e09ccaa430faae0488573f57;hpb=2edfa36685588a5e224d1f86b3fcc16c46766fea;p=elogind.git diff --git a/src/service.c b/src/service.c index 0b54e5bfc..023415170 100644 --- a/src/service.c +++ b/src/service.c @@ -1014,7 +1014,7 @@ static int service_add_default_dependencies(Service *s) { if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_BASIC_TARGET, NULL, true)) < 0) return r; - } else if (s->meta.manager->running_as == MANAGER_SESSION) { + } else if (s->meta.manager->running_as == MANAGER_USER) { if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SOCKETS_TARGET, NULL, true)) < 0) return r; @@ -1609,16 +1609,6 @@ static int service_spawn( goto fail; } -#ifdef HAVE_SYSV_COMPAT - /* Make sure we set TERM=linux for SysV scripts, since some - * require it to be set from the kernel */ - if (s->sysv_path && !strv_env_get(s->meta.manager->environment, "TERM")) - if (!(our_env[n_env++] = strdup("TERM=linux"))) { - r = -ENOMEM; - goto fail; - } -#endif - if (!(final_env = strv_env_merge(2, s->meta.manager->environment, our_env,