diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-17 02:37:55 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-17 02:37:55 -0500 |
| commit | 3f0ba0278cd61b2d3bb01abc744d98a6ba3d7730 (patch) | |
| tree | dc70188bf68d634496a429225130f777c155b990 /system-preset | |
| parent | 54ebaa42b40d22bd0288507420b7a7241896c357 (diff) | |
| parent | 58a6dd15582c038a25bd7059435833943e2e4617 (diff) | |
Merge commit '58a6dd15582c038a25bd7059435833943e2e4617' into notsystemd/premove
# Conflicts:
# Makefile.am
# src/boot/bootctl.c
# system-preset/90-systemd.preset
Diffstat (limited to 'system-preset')
| -rw-r--r-- | system-preset/90-journal-remote.preset | 13 | ||||
| -rw-r--r-- | system-preset/90-journald.preset | 5 | ||||
| -rw-r--r-- | system-preset/90-networkd.preset | 6 | ||||
| -rw-r--r-- | system-preset/90-timesyncd.preset | 3 |
4 files changed, 23 insertions, 4 deletions
diff --git a/system-preset/90-journal-remote.preset b/system-preset/90-journal-remote.preset new file mode 100644 index 0000000000..f5917b2b84 --- /dev/null +++ b/system-preset/90-journal-remote.preset @@ -0,0 +1,13 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +# These ones should be enabled by default, even if distributions +# generally follow a default-off policy. + +disable systemd-journal-gatewayd.* +disable systemd-journal-remote.* +disable systemd-journal-upload.* diff --git a/system-preset/90-journald.preset b/system-preset/90-journald.preset index 6a8c17b1fa..1022f0e86f 100644 --- a/system-preset/90-journald.preset +++ b/system-preset/90-journald.preset @@ -5,6 +5,7 @@ # the Free Software Foundation; either version 2.1 of the License, or # (at your option) any later version. -disable syslog.socket +# These ones should be enabled by default, even if distributions +# generally follow a default-off policy. -disable systemd-journal-gatewayd.* +disable syslog.socket diff --git a/system-preset/90-networkd.preset b/system-preset/90-networkd.preset index a053f7a4b1..609edafe23 100644 --- a/system-preset/90-networkd.preset +++ b/system-preset/90-networkd.preset @@ -5,6 +5,8 @@ # the Free Software Foundation; either version 2.1 of the License, or # (at your option) any later version. -enable systemd-networkd.service +# These ones should be enabled by default, even if distributions +# generally follow a default-off policy. -disable systemd-networkd-wait-online.service +enable systemd-networkd.service +enable systemd-networkd-wait-online.service diff --git a/system-preset/90-timesyncd.preset b/system-preset/90-timesyncd.preset index d40b418358..b42460ef5e 100644 --- a/system-preset/90-timesyncd.preset +++ b/system-preset/90-timesyncd.preset @@ -5,4 +5,7 @@ # the Free Software Foundation; either version 2.1 of the License, or # (at your option) any later version. +# These ones should be enabled by default, even if distributions +# generally follow a default-off policy. + enable systemd-timesyncd.service |