]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
veritysetup: mangle option strings like in cryptsetup
authorLennart Poettering <lennart@poettering.net>
Thu, 31 Mar 2022 09:01:52 +0000 (11:01 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 31 Mar 2022 09:44:46 +0000 (11:44 +0200)
src/veritysetup/veritysetup.c

index 5fc74f1c31f501dfa1169d2693a54862bdb4c919..3551ed4f3a6dd63fe65b7f72b4a1c9c14bbe10f3 100644 (file)
@@ -144,7 +144,7 @@ static int run(int argc, char *argv[]) {
                 data_device = argv[3];
                 verity_device = argv[4];
                 root_hash = argv[5];
-                options = argv[6];
+                options = mangle_none(argc > 6 ? argv[6] : NULL);
 
                 r = unhexmem(root_hash, SIZE_MAX, &m, &l);
                 if (r < 0)
@@ -162,7 +162,7 @@ static int run(int argc, char *argv[]) {
                         return 0;
                 }
 
-                if (argc > 6) {
+                if (options) {
                         r = parse_options(options);
                         if (r < 0)
                                 return log_error_errno(r, "Failed to parse options: %m");