summaryrefslogtreecommitdiff
path: root/system-preset
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-08-13 01:52:12 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-08-19 09:55:55 -0400
commit58a6dd15582c038a25bd7059435833943e2e4617 (patch)
tree8c6918f9c8aaabd148a301b9ffee3b188ec106d0 /system-preset
parent25ea92778d5f4339e07c152a99d16223f43ad681 (diff)
units: enable systemd-networkd-wait-online.service, disable all journal-remote stuff
The preset for systemd-networkd-wait-online.service should match whatever we do for systemd-networkd.service. s-n-wait-online.service is only pulled in when some other unit pulls in network-online.target, otherwise it's not used. But if something pulls in network-online.target, they should expect s-n-wait-online.service to be active iff systemd-networkd.service is active. OTOH, the journal-remote and journal-upload services should be disabled by default, since they don't do anything without additional configuration.
Diffstat (limited to 'system-preset')
-rw-r--r--system-preset/90-systemd.preset4
1 files changed, 3 insertions, 1 deletions
diff --git a/system-preset/90-systemd.preset b/system-preset/90-systemd.preset
index ee1b864bcf..09f920a5f7 100644
--- a/system-preset/90-systemd.preset
+++ b/system-preset/90-systemd.preset
@@ -15,6 +15,7 @@ enable getty@.service
enable systemd-timesyncd.service
enable systemd-networkd.service
enable systemd-resolved.service
+enable systemd-networkd-wait-online.service
disable console-getty.service
disable console-shell.service
@@ -29,4 +30,5 @@ disable rescue.target
disable syslog.socket
disable systemd-journal-gatewayd.*
-disable systemd-networkd-wait-online.service
+disable systemd-journal-remote.*
+disable systemd-journal-upload.*