From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 15 Nov 2023 12:17:31 +0000 (+0100)
Subject: gpt-auto-generator: don't eat up errors of generator_enable_remount_fs_service()
X-Git-Tag: v255-rc2~5^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=40b1224ea7ebc17bbdc78f5e75946c1c65eb0dbe;p=thirdparty%2Fsystemd.git

gpt-auto-generator: don't eat up errors of generator_enable_remount_fs_service()

I cannot see a reason why we should ignore this error, so let's not. We
use RET_GATHER() on the returns anyway, i.e. collect errors but
continue, so it makes sense to collect this one too.
---

diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index d1f6688f4ca..b2c78ef4c2b 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -648,7 +648,9 @@ static int add_partition_root_rw(DissectedPartition *p) {
                 return 0;
         }
 
-        (void) generator_enable_remount_fs_service(arg_dest);
+        r = generator_enable_remount_fs_service(arg_dest);
+        if (r < 0)
+                return r;
 
         path = strjoina(arg_dest, "/systemd-remount-fs.service.d/50-remount-rw.conf");