From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 7 Jun 2019 09:49:03 +0000 (+0200)
Subject: system-update-generator: do not emit bogus warning if no /system-update symlink
X-Git-Tag: v243-rc1~294^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=38928e3072b29ec002625e7359301a8c17b4d8a7;p=thirdparty%2Fsystemd.git

system-update-generator: do not emit bogus warning if no /system-update symlink

We only need to check for the kernel cmdline override our symlink is there.
---

diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c
index 77e265d7107..6ec4986c10c 100644
--- a/src/system-update-generator/system-update-generator.c
+++ b/src/system-update-generator/system-update-generator.c
@@ -57,9 +57,10 @@ static int run(const char *dest, const char *dest_early, const char *dest_late)
         assert_se(arg_dest = dest_early);
 
         r = generate_symlink();
-        if (r < 0)
+        if (r <= 0)
                 return r;
 
+        /* We parse the command line only to emit warnings. */
         r = proc_cmdline_parse(parse_proc_cmdline_item, NULL, 0);
         if (r < 0)
                 log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");