From: Lennart Poettering Date: Mon, 12 Dec 2016 12:42:06 +0000 (+0100) Subject: util-lib: read $SYSTEMD_PROC_CMDLINE if set when looking for the kernel cmdline X-Git-Tag: v233.3~114 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0abbcad2aa991459183cee29430c962d065f3a58;p=elogind.git util-lib: read $SYSTEMD_PROC_CMDLINE if set when looking for the kernel cmdline if we want to parse the kernel command line, let's check the $SYSTEMD_PROC_CMDLINE environment variable first. This is useful for debugging purposes. --- diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c index 281833f88..acdfec0a0 100644 --- a/src/basic/proc-cmdline.c +++ b/src/basic/proc-cmdline.c @@ -34,8 +34,22 @@ #include "virt.h" int proc_cmdline(char **ret) { + const char *e; assert(ret); + /* For testing purposes it is sometimes useful to be able to override what we consider /proc/cmdline to be */ + e = secure_getenv("SYSTEMD_PROC_CMDLINE"); + if (e) { + char *m; + + m = strdup(e); + if (!m) + return -ENOMEM; + + *ret = m; + return 0; + } + if (detect_container() > 0) return get_process_cmdline(1, 0, false, ret); else