chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b9ba604
)
service: fix sysv-less build
author
Mike Kazantsev
<mk.fraggod@gmail.com>
Tue, 26 Oct 2010 13:18:13 +0000
(15:18 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 26 Oct 2010 13:18:13 +0000
(15:18 +0200)
src/service.c
patch
|
blob
|
history
diff --git
a/src/service.c
b/src/service.c
index dac4adaa6a0efc2cfb1c18fa38349517da97870e..46d7bbb1c7b17774706dd43ef15f7be8b7194d68 100644
(file)
--- a/
src/service.c
+++ b/
src/service.c
@@
-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
* require it to be set from the kernel */
if (s->sysv_path && !strv_env_get(s->meta.manager->environment, "TERM"))
/* 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"))
@@
-1592,6
+1593,7
@@
static int service_spawn(
r = -ENOMEM;
goto fail;
}
r = -ENOMEM;
goto fail;
}
+#endif
if (!(final_env = strv_env_merge(2,
s->meta.manager->environment,
if (!(final_env = strv_env_merge(2,
s->meta.manager->environment,