diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-17 03:11:52 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-17 03:11:52 -0500 |
| commit | b849891b5dde5ee14ab8b7b7db74e65a4a38d993 (patch) | |
| tree | 29bb0e6fda9b4b170041913de495da057bbe3621 /src/grp-journal/90-journald.preset | |
| parent | 004efebf9cc559ea131bb9460ee0ee198e2d5da7 (diff) | |
| parent | 881228ff72434a0e3401a16bd87f179ef0ab1619 (diff) | |
Merge branch 'notsystemd/postmove' into notsystemd/master
# Conflicts:
# src/grp-journal/libjournal-core/.gitignore
# src/grp-system/libcore/include/core/mount.h
Diffstat (limited to 'src/grp-journal/90-journald.preset')
| -rw-r--r-- | src/grp-journal/90-journald.preset | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/grp-journal/90-journald.preset b/src/grp-journal/90-journald.preset index 6a8c17b1fa..1022f0e86f 100644 --- a/src/grp-journal/90-journald.preset +++ b/src/grp-journal/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 |