service: fix sysv-less build

This commit is contained in:
Mike Kazantsev 2010-10-26 15:18:13 +02:00 committed by Lennart Poettering
parent b9ba604e87
commit 0320828cac
1 changed files with 2 additions and 0 deletions

View File

@ -1585,6 +1585,7 @@ static int service_spawn(
goto fail; goto fail;
} }
#ifdef HAVE_SYSV_COMPAT
/* Make sure we set TERM=linux for SysV scripts, since some /* Make sure we set TERM=linux for SysV scripts, since some
* require it to be set from the kernel */ * require it to be set from the kernel */
if (s->sysv_path && !strv_env_get(s->meta.manager->environment, "TERM")) if (s->sysv_path && !strv_env_get(s->meta.manager->environment, "TERM"))
@ -1592,6 +1593,7 @@ static int service_spawn(
r = -ENOMEM; r = -ENOMEM;
goto fail; goto fail;
} }
#endif
if (!(final_env = strv_env_merge(2, if (!(final_env = strv_env_merge(2,
s->meta.manager->environment, s->meta.manager->environment,