From 02bb6cda87189ce0be10e8daba5c781f5eb90634 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 23 Dec 2013 18:10:57 +0100 Subject: [PATCH] util: when we try to read /proc/cmdline in a container, read /proc/1/cmdline instead --- src/shared/util.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/shared/util.c b/src/shared/util.c index 5c9d0bb73..8d7cf5398 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -5994,8 +5994,20 @@ int proc_cmdline(char **ret) { int r; if (detect_container(NULL) > 0) { - *ret = NULL; - return 0; + char *buf, *p; + size_t sz = 0; + + r = read_full_file("/proc/1/cmdline", &buf, &sz); + if (r < 0) + return r; + + for (p = buf; p + 1 < buf + sz; p++) + if (*p == 0) + *p = ' '; + + *p = 0; + *ret = buf; + return 1; } r = read_one_line_file("/proc/cmdline", ret); -- 2.30.2