From ad0cdb6b6768a7b8b8d6de32a9c1837b4b7773b0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 20 Nov 2018 11:48:48 +0100 Subject: [PATCH] veritysetup-generator: treat '-' and '_' as equivalent --- src/test/test-proc-cmdline.c | 12 ++++++------ src/veritysetup/veritysetup-generator.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/test/test-proc-cmdline.c b/src/test/test-proc-cmdline.c index 00cc2f4..b0fc217 100644 --- a/src/test/test-proc-cmdline.c +++ b/src/test/test-proc-cmdline.c @@ -53,17 +53,17 @@ static int parse_item_given(const char *key, const char *value, void *data) { bool *strip = data; log_info("%s: option <%s> = <%s>", __func__, key, strna(value)); - if (streq(key, "foo_bar")) + if (proc_cmdline_key_streq(key, "foo_bar")) assert_se(streq(value, "quux")); - else if (streq(key, "wuff-piep")) + else if (proc_cmdline_key_streq(key, "wuff-piep")) assert_se(streq(value, "tuet ")); - else if (streq(key, "space")) + else if (proc_cmdline_key_streq(key, "space")) assert_se(streq(value, "x y z")); - else if (streq(key, "miepf")) + else if (proc_cmdline_key_streq(key, "miepf")) assert_se(streq(value, "uuu")); - else if (in_initrd() && *strip && streq(key, "zumm")) + else if (in_initrd() && *strip && proc_cmdline_key_streq(key, "zumm")) assert_se(!value); - else if (in_initrd() && !*strip && streq(key, "rd.zumm")) + else if (in_initrd() && !*strip && proc_cmdline_key_streq(key, "rd.zumm")) assert_se(!value); else assert_not_reached("Bad key!"); diff --git a/src/veritysetup/veritysetup-generator.c b/src/veritysetup/veritysetup-generator.c index 0c63c5e..ebb688e 100644 --- a/src/veritysetup/veritysetup-generator.c +++ b/src/veritysetup/veritysetup-generator.c @@ -118,7 +118,7 @@ static int create_device(void) { static int parse_proc_cmdline_item(const char *key, const char *value, void *data) { int r; - if (streq(key, "systemd.verity")) { + if (proc_cmdline_key_streq(key, "systemd.verity")) { r = value ? parse_boolean(value) : 1; if (r < 0) @@ -126,7 +126,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat else arg_enabled = r; - } else if (streq(key, "roothash")) { + } else if (proc_cmdline_key_streq(key, "roothash")) { if (proc_cmdline_value_missing(key, value)) return 0; @@ -135,7 +135,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat if (r < 0) return log_oom(); - } else if (streq(key, "systemd.verity_root_data")) { + } else if (proc_cmdline_key_streq(key, "systemd.verity_root_data")) { if (proc_cmdline_value_missing(key, value)) return 0; @@ -144,7 +144,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat if (r < 0) return log_oom(); - } else if (streq(key, "systemd.verity_root_hash")) { + } else if (proc_cmdline_key_streq(key, "systemd.verity_root_hash")) { if (proc_cmdline_value_missing(key, value)) return 0; -- 2.7.4