From ed58820d7669971762dd887dc117d922c23f2543 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Thu, 25 Oct 2018 16:21:26 +0200 Subject: [PATCH] proc-cmdline: introduce PROC_CMDLINE_RD_STRICT Our current set of flags allows an option to be either use just in initrd or both in initrd and normal system. This new flag is intended to be used in the case where you want apply some settings just in initrd or just in normal system. --- src/basic/proc-cmdline.c | 3 ++- src/basic/proc-cmdline.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c index b386c705e1..647c61ce73 100644 --- a/src/basic/proc-cmdline.c +++ b/src/basic/proc-cmdline.c @@ -66,7 +66,8 @@ int proc_cmdline_parse_given(const char *line, proc_cmdline_parse_t parse_item, if (flags & PROC_CMDLINE_STRIP_RD_PREFIX) key = q; - } + } else if (in_initrd() && flags & PROC_CMDLINE_RD_STRICT) + continue; value = strchr(key, '='); if (value) diff --git a/src/basic/proc-cmdline.h b/src/basic/proc-cmdline.h index ffc45fddb9..bb8b18d3b1 100644 --- a/src/basic/proc-cmdline.h +++ b/src/basic/proc-cmdline.h @@ -8,6 +8,7 @@ enum { PROC_CMDLINE_STRIP_RD_PREFIX = 1, PROC_CMDLINE_VALUE_OPTIONAL = 2, + PROC_CMDLINE_RD_STRICT = 4 }; typedef int (*proc_cmdline_parse_t)(const char *key, const char *value, void *data);