emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

sysctl: config directory order

Browse Source 
Matches the systemd directory order (/run is after /etc) and
document what directories are used better.
This commit is contained in:
Craig Small 2020-02-27 21:56:13 +11:00
parent 5cd29e5093
commit 24a1574f0a
4 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -14,6 +14,8 @@ procps-ng-3.3.16
* docs: install translated man pages issue #146
* pgrep: Match on runstate issue #109, Debian #919381
* snice: Fix matching on pid merge #89
* sysctl: Match systemd directory order
* sysctl: Document directory order Debian #951550
* top: can now exploit 256-color terminals issue #96
* top: preserves 'other filters' in configuration file issue #99
* top: can now collapse/expand forest view children issue #99

16
sysctl.8
View File

@ -6,7 +6,7 @@
.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
.\" GNU General Public License for more details."
.TH SYSCTL "8" "2018-02-19" "procps-ng" "System Administration"
.TH SYSCTL "8" "2020-02-27" "procps-ng" "System Administration"
.SH NAME
sysctl \- configure kernel parameters at runtime
.SH SYNOPSIS
@ -81,10 +81,10 @@ directories in the following list in given order from top to bottom.
Once a file of a given filename is loaded, any file of the same name
in subsequent directories is ignored.
.br
/run/sysctl.d/*.conf
.br
/etc/sysctl.d/*.conf
.br
/run/sysctl.d/*.conf
.br
/usr/local/lib/sysctl.d/*.conf
.br
/usr/lib/sysctl.d/*.conf
@ -152,6 +152,16 @@ echo 256 > /proc/sys/net/ipv6/neigh/eth0/base_reachable_time
.SH FILES
.I /proc/sys
.br
.I /etc/sysctl.d/*.conf
.br
.I /run/sysctl.d/*.conf
.br
.I /usr/local/lib/sysctl.d/*.conf
.br
.I /usr/lib/sysctl.d/*.conf
.br
.I /lib/sysctl.d/*.conf
.br
.I /etc/sysctl.conf
.SH SEE ALSO
.BR sysctl.conf (5)

2
sysctl.c
View File

@ -622,8 +622,8 @@ static int PreloadSystem(void)
{
unsigned di, i;
const char *dirs[] = {
"/run/sysctl.d",
"/etc/sysctl.d",
"/run/sysctl.d",
"/usr/local/lib/sysctl.d",
"/usr/lib/sysctl.d",
"/lib/sysctl.d",

30
sysctl.conf.5
View File

@ -6,7 +6,7 @@
.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
.\" GNU General Public License for more details."
.TH SYSCTL.CONF "5" "2019-09-21" "procps-ng" "File Formats"
.TH SYSCTL.CONF "5" "2020-02-27" "procps-ng" "File Formats"
.SH NAME
sysctl.conf \- sysctl preload/configuration file
.SH DESCRIPTION
@ -55,22 +55,22 @@ to list all possible parameters. The description of individual parameters can be
.RE
.PP
.SH FILES
.TP
/run/sysctl.d/*.conf
.TQ
/etc/sysctl.d/*.conf
.TQ
/usr/local/lib/sysctl.d/*.conf
.TQ
/usr/lib/sysctl.d/*.conf
.TQ
/lib/sysctl.d/*.conf
.TQ
/etc/sysctl.conf
.I /etc/sysctl.d/*.conf
.br
.I /run/sysctl.d/*.conf
.br
.I /usr/local/lib/sysctl.d/*.conf
.br
.I /usr/lib/sysctl.d/*.conf
.br
.I /lib/sysctl.d/*.conf
.br
.I /etc/sysctl.conf
The paths where
sysctl
.B sysctl
preload files usually exist. See also
sysctl
.B sysctl
option
.IR \-\-system .
.SH SEE ALSO