summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-03-13 18:38:09 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-03-31 14:55:14 +0200
commit5ef9eda17fda06aaf81ab3f0ff6f87a80b860c94 (patch)
treeaa7394c1397326dbaab24fc53f65b845f19ee394
parent7e1ed1f3b29162df25064b33dc55ac8cf432bb0b (diff)
downloadsystemd-5ef9eda17fda06aaf81ab3f0ff6f87a80b860c94.tar.gz
units: make systemd-homed.service installable
Fixes #15083. Users might want to disable homed if not used to save resources.
-rw-r--r--presets/90-systemd.preset1
-rw-r--r--test/units/testsuite-46.service4
-rw-r--r--units/meson.build3
-rw-r--r--units/systemd-homed.service.in4
4 files changed, 9 insertions, 3 deletions
diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset
index 7406c92a5c..53eb8a7806 100644
--- a/presets/90-systemd.preset
+++ b/presets/90-systemd.preset
@@ -20,6 +20,7 @@ enable systemd-timesyncd.service
enable systemd-networkd.service
enable systemd-resolved.service
enable systemd-repart.service
+enable systemd-homed.service
disable console-getty.service
disable debug-shell.service
diff --git a/test/units/testsuite-46.service b/test/units/testsuite-46.service
index da359cbb23..7698f35979 100644
--- a/test/units/testsuite-46.service
+++ b/test/units/testsuite-46.service
@@ -1,7 +1,9 @@
[Unit]
Description=TEST-46-HOMED
-Before=getty-pre.target
Wants=getty-pre.target
+Before=getty-pre.target
+Wants=systemd-homed.service
+After=systemd-homed.service
[Service]
ExecStartPre=rm -f /failed /testok
diff --git a/units/meson.build b/units/meson.build
index 9964eb79a4..d8ee6df184 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -201,8 +201,7 @@ in_units = [
['systemd-portabled.service', 'ENABLE_PORTABLED',
'dbus-org.freedesktop.portable1.service'],
['systemd-userdbd.service', 'ENABLE_USERDB'],
- ['systemd-homed.service', 'ENABLE_HOMED',
- 'multi-user.target.wants/ dbus-org.freedesktop.home1.service'],
+ ['systemd-homed.service', 'ENABLE_HOMED'],
['systemd-quotacheck.service', 'ENABLE_QUOTACHECK'],
['systemd-random-seed.service', 'ENABLE_RANDOMSEED',
'sysinit.target.wants/'],
diff --git a/units/systemd-homed.service.in b/units/systemd-homed.service.in
index 7cf98e6fa6..8138f5125c 100644
--- a/units/systemd-homed.service.in
+++ b/units/systemd-homed.service.in
@@ -34,3 +34,7 @@ SystemCallArchitectures=native
SystemCallErrorNumber=EPERM
SystemCallFilter=@system-service @mount
@SERVICE_WATCHDOG@
+
+[Install]
+WantedBy=multi-user.target
+Alias=dbus-org.freedesktop.home1.service