summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-02-05 19:44:13 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-02-05 19:44:13 -0500
commitee46e555702715f1adcc3381dac73e76e2d9a048 (patch)
tree91914e58700a13d85853379a04cd3230f09887e7
parent823f4a91ebd8942a2c1ff31050dc55eaa60f6ffc (diff)
shared/log: read /proc/cmdline only in daemons
http://lists.freedesktop.org/archives/systemd-devel/2015-February/027960.html
-rw-r--r--src/shared/log.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/shared/log.c b/src/shared/log.c
index 03ef018bd4..646a1d6389 100644
--- a/src/shared/log.c
+++ b/src/shared/log.c
@@ -949,7 +949,11 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
void log_parse_environment(void) {
const char *e;
- (void) parse_proc_cmdline(parse_proc_cmdline_item);
+ if (get_ctty_devnr(0, NULL) < 0)
+ /* Only try to read the command line in daemons.
+ We assume that anything that has a controlling
+ tty is user stuff. */
+ (void) parse_proc_cmdline(parse_proc_cmdline_item);
e = secure_getenv("SYSTEMD_LOG_TARGET");
if (e && log_set_target_from_string(e) < 0)