]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
install: fail early if specifier expansion failed
authorDavid Tardon <dtardon@redhat.com>
Tue, 21 Feb 2023 13:10:33 +0000 (14:10 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Tue, 21 Feb 2023 18:39:07 +0000 (18:39 +0000)
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

src/shared/install.c

index 6870654426bfc7dffe821319a67c45d956dd67fa..bd12259da016e787ad76f154e61f824cdf59c4a0 100644 (file)
@@ -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)) {