From: Mike Yuan <me@yhndnzj.com>
Date: Mon, 3 Apr 2023 10:42:39 +0000 (+0800)
Subject: core/main: also check the argument terminator
X-Git-Tag: v254-rc1~824
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=09567df7db75824f1b8bf0b5cc721febda03cb56;p=thirdparty%2Fsystemd.git

core/main: also check the argument terminator

For future-proof reasons, in case we will add
another option that starts with --deserialize.

Addresses https://github.com/systemd/systemd/commit/4f44d2c4f76922a4f48dd4473e6abaca40d7e555#r107285603
---

diff --git a/src/core/main.c b/src/core/main.c
index bcc5e15a789..2cd2da72848 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -2744,7 +2744,7 @@ static bool early_skip_setup_check(int argc, char *argv[]) {
         for (int i = 1; i < argc; i++)
                 if (streq(argv[i], "--switched-root"))
                         return false; /* If we switched root, don't skip the setup. */
-                else if (startswith(argv[i], "--deserialize"))
+                else if (startswith(argv[i], "--deserialize=") || streq(argv[i], "--deserialize"))
                         found_deserialize = true;
 
         return found_deserialize; /* When we are deserializing, then we are reexecuting, hence avoid the extensive setup */