X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fservice.c;h=429b53d4f880b735836afaef02f79d23600323e9;hb=8e1bd70d4ce6d3881c1df6a6482643a2b3a69bb1;hp=184ddf91437f8d4a1e70845e5ff3dca7ce43cc09;hpb=af2d49f70bcff20efaf2d69aecaf4b3e898ff1fa;p=elogind.git

diff --git a/src/service.c b/src/service.c
index 184ddf914..429b53d4f 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1055,7 +1055,7 @@ static int service_load(Unit *u) {
                 if ((r = unit_add_exec_dependencies(u, &s->exec_context)) < 0)
                         return r;
 
-                if ((r = unit_add_default_cgroup(u)) < 0)
+                if ((r = unit_add_default_cgroups(u)) < 0)
                         return r;
 
 #ifdef HAVE_SYSV_COMPAT
@@ -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,