chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
units: run sysv related scripts with TERM=linux
[elogind.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 9a51a9187ffe03a2c1b5c01d6b96a6a671180273..7dad015e3034ed86ad23508d1270185b5c86162b 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-333,7
+333,7
@@
static int parse_proc_cmdline_word(const char *word) {
#ifdef HAVE_SYSV_COMPAT
"systemd.sysv_console=0|1 Connect output of SysV scripts to console\n"
#endif
#ifdef HAVE_SYSV_COMPAT
"systemd.sysv_console=0|1 Connect output of SysV scripts to console\n"
#endif
- "systemd.log_target=console|kmsg|syslog|syslog-or
g
-kmsg|null\n"
+ "systemd.log_target=console|kmsg|syslog|syslog-or-kmsg|null\n"
" Log target\n"
"systemd.log_level=LEVEL Log level\n"
"systemd.log_color=0|1 Highlight important log messages\n"
" Log target\n"
"systemd.log_level=LEVEL Log level\n"
"systemd.log_color=0|1 Highlight important log messages\n"
@@
-975,8
+975,10
@@
int main(int argc, char *argv[]) {
/* Unset some environment variables passed in from the kernel
* that don't really make sense for us. */
/* Unset some environment variables passed in from the kernel
* that don't really make sense for us. */
- unsetenv("HOME");
- unsetenv("TERM");
+ if (arg_running_as == MANAGER_SYSTEM) {
+ unsetenv("HOME");
+ unsetenv("TERM");
+ }
/* Move out of the way, so that we won't block unmounts */
assert_se(chdir("/") == 0);
/* Move out of the way, so that we won't block unmounts */
assert_se(chdir("/") == 0);