X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fservice.c;h=dac4adaa6a0efc2cfb1c18fa38349517da97870e;hb=9865f3b4cacabf78ddfdca5973c44cecbbf3d2a5;hp=7a522bf3f47d865dde181fa2a33d16f014f5edb5;hpb=39439087bf398c7d5b5baf1e79460f439b2f5ad9;p=elogind.git diff --git a/src/service.c b/src/service.c index 7a522bf3f..dac4adaa6 100644 --- a/src/service.c +++ b/src/service.c @@ -1568,7 +1568,7 @@ static int service_spawn( goto fail; } - if (!(our_env = new0(char*, 3))) { + if (!(our_env = new0(char*, 4))) { r = -ENOMEM; goto fail; } @@ -1585,6 +1585,14 @@ static int service_spawn( goto fail; } + /* 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; + } + if (!(final_env = strv_env_merge(2, s->meta.manager->environment, our_env,