From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 27 Nov 2018 12:50:37 +0000 (+0100)
Subject: install: when enabling a template unit without DefaultInstance= nor specified instanc... 
X-Git-Tag: v240~195^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10954%2Fhead;p=thirdparty%2Fsystemd.git

install: when enabling a template unit without DefaultInstance= nor specified instance don't do anything

Previously, we'd link the unit file into /etc in this case, but that
should only be done if the unit file is not in the search path anyway,
and this is already done implicitly anyway for all enabled unit files,
hence no reason to duplicate this here.

Fixes: #10253
---

diff --git a/src/shared/install.c b/src/shared/install.c
index 735e1f5b0e0..28e07a23a55 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1752,12 +1752,16 @@ static int install_info_symlink_wants(
         if (strv_isempty(list))
                 return 0;
 
-        if (unit_name_is_valid(i->name, UNIT_NAME_TEMPLATE) && i->default_instance) {
+        if (unit_name_is_valid(i->name, UNIT_NAME_TEMPLATE)) {
                 UnitFileInstallInfo instance = {
                         .type = _UNIT_FILE_TYPE_INVALID,
                 };
                 _cleanup_free_ char *path = NULL;
 
+                /* If this is a template, and we have no instance, don't do anything */
+                if (!i->default_instance)
+                        return 1;
+
                 r = unit_name_replace_instance(i->name, i->default_instance, &buf);
                 if (r < 0)
                         return r;