summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/system.conf.in3
-rw-r--r--src/journal-remote/journal-remote.conf.in13
-rw-r--r--src/journal-remote/journal-upload.conf.in13
-rw-r--r--src/journal/journald.conf1
-rw-r--r--src/network/meson.build3
-rw-r--r--src/network/networkd.conf16
6 files changed, 47 insertions, 2 deletions
diff --git a/src/core/system.conf.in b/src/core/system.conf.in
index f0a59a79a5..639b5818ff 100644
--- a/src/core/system.conf.in
+++ b/src/core/system.conf.in
@@ -26,6 +26,7 @@
#JoinControllers=cpu,cpuacct net_cls,net_prio
#RuntimeWatchdogSec=0
#ShutdownWatchdogSec=10min
+#WatchdogDevice=
#CapabilityBoundingSet=
#NoNewPrivileges=no
#SystemCallArchitectures=
@@ -62,5 +63,3 @@
#DefaultLimitNICE=
#DefaultLimitRTPRIO=
#DefaultLimitRTTIME=
-#IPAddressAllow=
-#IPAddressDeny=
diff --git a/src/journal-remote/journal-remote.conf.in b/src/journal-remote/journal-remote.conf.in
index 7122d63362..edc3abab4b 100644
--- a/src/journal-remote/journal-remote.conf.in
+++ b/src/journal-remote/journal-remote.conf.in
@@ -1,3 +1,16 @@
+# 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.
+#
+# Entries in this file show the compile time defaults.
+# You can change settings by editing this file.
+# Defaults can be restored by simply deleting this file.
+#
+# See journal-remote.conf(5) for details
+
[Remote]
# Seal=false
# SplitMode=host
diff --git a/src/journal-remote/journal-upload.conf.in b/src/journal-remote/journal-upload.conf.in
index c5670682e8..5f59a6fe80 100644
--- a/src/journal-remote/journal-upload.conf.in
+++ b/src/journal-remote/journal-upload.conf.in
@@ -1,3 +1,16 @@
+# 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.
+#
+# Entries in this file show the compile time defaults.
+# You can change settings by editing this file.
+# Defaults can be restored by simply deleting this file.
+#
+# See journal-upload.conf(5) for details
+
[Upload]
# URL=
# ServerKeyFile=@CERTIFICATEROOT@/private/journal-upload.pem
diff --git a/src/journal/journald.conf b/src/journal/journald.conf
index 94d5c678aa..2f1c661153 100644
--- a/src/journal/journald.conf
+++ b/src/journal/journald.conf
@@ -40,3 +40,4 @@
#MaxLevelConsole=info
#MaxLevelWall=emerg
#LineMax=48K
+#ReadKMsg=yes
diff --git a/src/network/meson.build b/src/network/meson.build
index 8f5544ea04..8f63815b12 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -131,6 +131,9 @@ if conf.get('ENABLE_NETWORKD') == 1
install_dir : polkitpkladir)
endif
+ install_data('networkd.conf',
+ install_dir : pkgsysconfdir)
+
tests += [
[['src/network/test-networkd-conf.c'],
[libnetworkd_core,
diff --git a/src/network/networkd.conf b/src/network/networkd.conf
new file mode 100644
index 0000000000..8dc5676166
--- /dev/null
+++ b/src/network/networkd.conf
@@ -0,0 +1,16 @@
+# 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.
+#
+# Entries in this file show the compile time defaults.
+# You can change settings by editing this file.
+# Defaults can be restored by simply deleting this file.
+#
+# See networkd.conf(5) for details
+
+[DHCP]
+#DUIDType=vendor
+#DUIDRawData=