From: David Tardon <dtardon@redhat.com>
Date: Tue, 21 Feb 2023 13:10:33 +0000 (+0100)
Subject: install: fail early if specifier expansion failed
X-Git-Tag: v254-rc1~1215
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8979e869812988835f6951fb73a68e30a4c608c;p=thirdparty%2Fsystemd.git

install: fail early if specifier expansion failed

Before:

systemd[1]: Assertion 'path' failed at src/shared/install.c:288, function install_changes_add(). Aborting.
systemd[1]: Caught <ABRT> from our own process.
systemd[1]: Caught <ABRT>, dumped core as pid 2525.
systemd[1]: Freezing execution

After:

Failed to enable unit: Invalid specifier in user-%J.service

Fixes #26467.

Follow-up for: f5a0162
---

diff --git a/src/shared/install.c b/src/shared/install.c
index 6870654426b..bd12259da01 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1995,6 +1995,8 @@ static int install_info_symlink_wants(
                         install_changes_add(changes, n_changes, q, *s, NULL);
                         if (r >= 0)
                                 r = q;
+
+                        continue;
                 }
 
                 if (!unit_name_is_valid(dst, valid_dst_type)) {