Merge pull request #9422 from yuwata/conf-files
cleanups for default conf files
This commit is contained in:
commit
ca285cdb40
|
@ -322,15 +322,16 @@
|
||||||
<term><varname>DefaultBlockIOAccounting=</varname></term>
|
<term><varname>DefaultBlockIOAccounting=</varname></term>
|
||||||
<term><varname>DefaultMemoryAccounting=</varname></term>
|
<term><varname>DefaultMemoryAccounting=</varname></term>
|
||||||
<term><varname>DefaultTasksAccounting=</varname></term>
|
<term><varname>DefaultTasksAccounting=</varname></term>
|
||||||
|
<term><varname>DefaultIOAccounting=</varname></term>
|
||||||
<term><varname>DefaultIPAccounting=</varname></term>
|
<term><varname>DefaultIPAccounting=</varname></term>
|
||||||
|
|
||||||
<listitem><para>Configure the default resource accounting settings, as configured per-unit by
|
<listitem><para>Configure the default resource accounting settings, as configured per-unit by
|
||||||
<varname>CPUAccounting=</varname>, <varname>BlockIOAccounting=</varname>, <varname>MemoryAccounting=</varname>,
|
<varname>CPUAccounting=</varname>, <varname>BlockIOAccounting=</varname>, <varname>MemoryAccounting=</varname>,
|
||||||
<varname>TasksAccounting=</varname> and <varname>IPAccounting=</varname>. See
|
<varname>TasksAccounting=</varname>, <varname>IOAccounting=</varname> and <varname>IPAccounting=</varname>. See
|
||||||
<citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>
|
<citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>
|
||||||
for details on the per-unit settings. <varname>DefaultTasksAccounting=</varname> defaults to on,
|
for details on the per-unit settings. <varname>DefaultTasksAccounting=</varname> defaults to on,
|
||||||
<varname>DefaultMemoryAccounting=</varname> to &MEMORY_ACCOUNTING_DEFAULT;,
|
<varname>DefaultMemoryAccounting=</varname> to &MEMORY_ACCOUNTING_DEFAULT;,
|
||||||
the other three settings to off.</para></listitem>
|
the other four settings to off.</para></listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#JoinControllers=cpu,cpuacct net_cls,net_prio
|
#JoinControllers=cpu,cpuacct net_cls,net_prio
|
||||||
#RuntimeWatchdogSec=0
|
#RuntimeWatchdogSec=0
|
||||||
#ShutdownWatchdogSec=10min
|
#ShutdownWatchdogSec=10min
|
||||||
|
#WatchdogDevice=
|
||||||
#CapabilityBoundingSet=
|
#CapabilityBoundingSet=
|
||||||
#NoNewPrivileges=no
|
#NoNewPrivileges=no
|
||||||
#SystemCallArchitectures=
|
#SystemCallArchitectures=
|
||||||
|
@ -62,5 +63,3 @@
|
||||||
#DefaultLimitNICE=
|
#DefaultLimitNICE=
|
||||||
#DefaultLimitRTPRIO=
|
#DefaultLimitRTPRIO=
|
||||||
#DefaultLimitRTTIME=
|
#DefaultLimitRTTIME=
|
||||||
#IPAddressAllow=
|
|
||||||
#IPAddressDeny=
|
|
||||||
|
|
|
@ -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]
|
[Remote]
|
||||||
# Seal=false
|
# Seal=false
|
||||||
# SplitMode=host
|
# SplitMode=host
|
||||||
|
|
|
@ -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]
|
[Upload]
|
||||||
# URL=
|
# URL=
|
||||||
# ServerKeyFile=@CERTIFICATEROOT@/private/journal-upload.pem
|
# ServerKeyFile=@CERTIFICATEROOT@/private/journal-upload.pem
|
||||||
|
|
|
@ -40,3 +40,4 @@
|
||||||
#MaxLevelConsole=info
|
#MaxLevelConsole=info
|
||||||
#MaxLevelWall=emerg
|
#MaxLevelWall=emerg
|
||||||
#LineMax=48K
|
#LineMax=48K
|
||||||
|
#ReadKMsg=yes
|
||||||
|
|
|
@ -131,6 +131,9 @@ if conf.get('ENABLE_NETWORKD') == 1
|
||||||
install_dir : polkitpkladir)
|
install_dir : polkitpkladir)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
install_data('networkd.conf',
|
||||||
|
install_dir : pkgsysconfdir)
|
||||||
|
|
||||||
tests += [
|
tests += [
|
||||||
[['src/network/test-networkd-conf.c'],
|
[['src/network/test-networkd-conf.c'],
|
||||||
[libnetworkd_core,
|
[libnetworkd_core,
|
||||||
|
|
|
@ -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=
|
Loading…
Reference in New Issue