From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 16 Jun 2014 23:22:55 +0000 (+0200)
Subject: install: "systemctl enable" should be a nop for template units lacking a DefaultInsta... 
X-Git-Tag: v215~383
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=0a327d753f992ffdcff5f38c861c90bfa1f5a4af;hp=1713703c966d85de2591498b45b6c035d04350aa

install: "systemctl enable" should be a nop for template units lacking a DefaultInstance= setting
---

diff --git a/src/shared/install.c b/src/shared/install.c
index 26dbbb6f0..39f5dd2d2 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1302,7 +1302,14 @@ static int install_info_symlink_wants(
         assert(i);
         assert(config_path);
 
-        if (unit_name_is_template(i->name) && i->default_instance) {
+        if (unit_name_is_template(i->name)) {
+
+                /* Don't install any symlink if there's no default
+                 * instance configured */
+
+                if (!i->default_instance)
+                        return 0;
+
                 buf = unit_name_replace_instance(i->name, i->default_instance);
                 if (!buf)
                         return -ENOMEM;