daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
87d178
From db2816ee32fc81ba339175469e46b5dca7af8833 Mon Sep 17 00:00:00 2001
87d178
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
87d178
Date: Sat, 22 Aug 2020 11:58:15 +0200
87d178
Subject: [PATCH] shared/install: fix preset operations for non-service
87d178
 instantiated units
87d178
87d178
Fixes https://github.com/coreos/ignition/issues/1064.
87d178
87d178
(cherry picked from commit 47ab95fe4315b3f7ee5a3694460a744bb88c52fd)
87d178
87d178
Related: #1812972
87d178
---
87d178
 src/shared/install.c | 13 +++++--------
87d178
 1 file changed, 5 insertions(+), 8 deletions(-)
87d178
87d178
diff --git a/src/shared/install.c b/src/shared/install.c
87d178
index 263b239f10..c2847df3f8 100644
87d178
--- a/src/shared/install.c
87d178
+++ b/src/shared/install.c
87d178
@@ -2937,20 +2937,17 @@ static int pattern_match_multiple_instances(
87d178
 
87d178
         /* Compose a list of specified instances when unit name is a template  */
87d178
         if (unit_name_is_valid(unit_name, UNIT_NAME_TEMPLATE)) {
87d178
-                _cleanup_free_ char *prefix = NULL;
87d178
                 _cleanup_strv_free_ char **out_strv = NULL;
87d178
-                char **iter;
87d178
-
87d178
-                r = unit_name_to_prefix(unit_name, &prefix);
87d178
-                if (r < 0)
87d178
-                        return r;
87d178
 
87d178
+                char **iter;
87d178
                 STRV_FOREACH(iter, rule.instances) {
87d178
                         _cleanup_free_ char *name = NULL;
87d178
-                        r = unit_name_build(prefix, *iter, ".service", &name);
87d178
+
87d178
+                        r = unit_name_replace_instance(unit_name, *iter, &name);
87d178
                         if (r < 0)
87d178
                                 return r;
87d178
-                        r = strv_extend(&out_strv, name);
87d178
+
87d178
+                        r = strv_consume(&out_strv, TAKE_PTR(name));
87d178
                         if (r < 0)
87d178
                                 return r;
87d178
                 }