blob: f83107f5395127b3547ba44321f600a63f2779ee [file] [log] [blame]
From 3f5a187dcf8ad2f0690046876d30d37630c11014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <>
Date: Wed, 17 Aug 2016 22:15:54 -0400
Subject: [PATCH] shared/install: properly report masked units listed in Also=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
A masked unit is listed in Also=:
$ systemctl cat test1 test2
# /etc/systemd/system/test1.service
Description=test service 1
# /dev/null
$ systemctl --root=/ enable test1
Created symlink /etc/systemd/system/alias1.service /etc/systemd/system/test1.service.
Created symlink /etc/systemd/system/ /etc/systemd/system/test1.service.
The unit files have no installation config (WantedBy, RequiredBy, Also, Alias
settings in the [Install] section, and DefaultInstance for template units).
This means they are not meant to be enabled using systemctl.
Possible reasons for having this kind of units are:
1) A unit may be statically enabled by being symlinked from another unit's
.wants/ or .requires/ directory.
2) A unit's purpose may be to act as a helper for some other unit which has
a requirement dependency on it.
3) A unit may be started when needed via activation (socket, path, timer,
D-Bus, udev, scripted systemctl call, ...).
4) In case of template units, the unit is meant to be enabled with some
instance name specified.
Created symlink /etc/systemd/system/alias1.service /etc/systemd/system/test1.service.
Created symlink /etc/systemd/system/ /etc/systemd/system/test1.service.
Unit /etc/systemd/system/test2.service is masked, ignoring.
(cherry picked from commit f16517151310b88591f3501a59e23ae2a79e7f02)
src/shared/install.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/shared/install.c b/src/shared/install.c
index 9ce8e4d390..9d9f4dff4f 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1686,6 +1686,17 @@ static int install_context_apply(
if (r < 0)
return r;
+ /* We can attempt to process a masked unit when a different unit
+ * that we were processing specifies it in DefaultInstance= or Also=. */
+ if (i->type == UNIT_FILE_TYPE_MASKED) {
+ unit_file_changes_add(changes, n_changes, UNIT_FILE_IS_MASKED, i->path, NULL);
+ if (r >= 0)
+ /* Assume that some *could* have been enabled here, avoid
+ * "empty [Install] section" warning. */
+ r += 1;
+ continue;
+ }
if (i->type != UNIT_FILE_TYPE_REGULAR)