From 3632149409719e819634155912371c27a70f3a2d Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 26 Jun 2018 03:34:49 +0900 Subject: [PATCH 1/5] network: provide default networkd.conf --- src/network/meson.build | 3 +++ src/network/networkd.conf | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 src/network/networkd.conf 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= From a4d5708c794e0a8e7f61ac08167bea3eac5282ab Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 26 Jun 2018 04:04:45 +0900 Subject: [PATCH 2/5] journal-remote: add license and reference to man page in conf files --- src/journal-remote/journal-remote.conf.in | 13 +++++++++++++ src/journal-remote/journal-upload.conf.in | 13 +++++++++++++ 2 files changed, 26 insertions(+) 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 From 2dcacc7363cab4f4aaa3e62df99af6cfd02fe4e7 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 26 Jun 2018 04:05:42 +0900 Subject: [PATCH 3/5] journal: add missing option in journald.conf --- src/journal/journald.conf | 1 + 1 file changed, 1 insertion(+) 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 From e761599ffd1ce97b11f617c8f011f6e54349d547 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 26 Jun 2018 04:07:19 +0900 Subject: [PATCH 4/5] core: add missing option and drop nonexistent option in system.conf --- src/core/system.conf.in | 3 +-- 1 file changed, 1 insertion(+), 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= From b34a21083b8937f2bb562e2cefdd85b4381aa621 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 26 Jun 2018 04:07:44 +0900 Subject: [PATCH 5/5] man: add missing option for system.conf --- man/systemd-system.conf.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index a914ef2523..88dcd1d142 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -322,15 +322,16 @@ DefaultBlockIOAccounting= DefaultMemoryAccounting= DefaultTasksAccounting= + DefaultIOAccounting= DefaultIPAccounting= Configure the default resource accounting settings, as configured per-unit by CPUAccounting=, BlockIOAccounting=, MemoryAccounting=, - TasksAccounting= and IPAccounting=. See + TasksAccounting=, IOAccounting= and IPAccounting=. See systemd.resource-control5 for details on the per-unit settings. DefaultTasksAccounting= defaults to on, DefaultMemoryAccounting= to &MEMORY_ACCOUNTING_DEFAULT;, - the other three settings to off. + the other four settings to off.