Blame SOURCES/procps-ng-3.3.15-sysctl-config-dir-order.patch

f4404b
diff -up ./NEWS.ori ./NEWS
f4404b
diff -up ./sysctl.8.ori ./sysctl.8
f4404b
--- ./sysctl.8.ori	2018-03-03 07:59:18.064843718 +0100
f4404b
+++ ./sysctl.8	2022-07-29 16:33:02.906648974 +0200
f4404b
@@ -6,7 +6,7 @@
f4404b
 .\" but WITHOUT ANY WARRANTY; without even the implied warranty of
f4404b
 .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
f4404b
 .\" GNU General Public License for more details."
f4404b
-.TH SYSCTL "8" "2018-02-19" "procps-ng" "System Administration"
f4404b
+.TH SYSCTL "8" "2020-02-27" "procps-ng" "System Administration"
f4404b
 .SH NAME
f4404b
 sysctl \- configure kernel parameters at runtime
f4404b
 .SH SYNOPSIS
f4404b
@@ -81,10 +81,10 @@ directories in the following list in giv
f4404b
 Once a file of a given filename is loaded, any file of the same name
f4404b
 in subsequent directories is ignored.
f4404b
 .br
f4404b
-/run/sysctl.d/*.conf
f4404b
-.br
f4404b
 /etc/sysctl.d/*.conf
f4404b
 .br
f4404b
+/run/sysctl.d/*.conf
f4404b
+.br
f4404b
 /usr/local/lib/sysctl.d/*.conf
f4404b
 .br
f4404b
 /usr/lib/sysctl.d/*.conf
f4404b
@@ -152,6 +152,16 @@ echo 256 > /proc/sys/net/ipv6/neigh/eth0
f4404b
 .SH FILES
f4404b
 .I /proc/sys
f4404b
 .br
f4404b
+.I /etc/sysctl.d/*.conf
f4404b
+.br
f4404b
+.I /run/sysctl.d/*.conf
f4404b
+.br
f4404b
+.I /usr/local/lib/sysctl.d/*.conf
f4404b
+.br
f4404b
+.I /usr/lib/sysctl.d/*.conf
f4404b
+.br
f4404b
+.I /lib/sysctl.d/*.conf
f4404b
+.br
f4404b
 .I /etc/sysctl.conf
f4404b
 .SH SEE ALSO
f4404b
 .BR sysctl.conf (5)
f4404b
diff -up ./sysctl.conf.5.ori ./sysctl.conf.5
f4404b
--- ./sysctl.conf.5.ori	2017-12-22 05:13:14.771653252 +0100
f4404b
+++ ./sysctl.conf.5	2022-07-29 16:33:02.907648980 +0200
f4404b
@@ -51,22 +51,22 @@ to list all possible parameters. The des
f4404b
 .RE
f4404b
 .PP
f4404b
 .SH FILES
f4404b
-.TP
f4404b
-/run/sysctl.d/*.conf
f4404b
-.TQ
f4404b
-/etc/sysctl.d/*.conf
f4404b
-.TQ
f4404b
-/usr/local/lib/sysctl.d/*.conf
f4404b
-.TQ
f4404b
-/usr/lib/sysctl.d/*.conf
f4404b
-.TQ
f4404b
-/lib/sysctl.d/*.conf
f4404b
-.TQ
f4404b
-/etc/sysctl.conf
f4404b
+.I /etc/sysctl.d/*.conf
f4404b
+.br
f4404b
+.I /run/sysctl.d/*.conf
f4404b
+.br
f4404b
+.I /usr/local/lib/sysctl.d/*.conf
f4404b
+.br
f4404b
+.I /usr/lib/sysctl.d/*.conf
f4404b
+.br
f4404b
+.I /lib/sysctl.d/*.conf
f4404b
+.br
f4404b
+.I /etc/sysctl.conf
f4404b
+
f4404b
 The paths where
f4404b
-sysctl
f4404b
+.B sysctl
f4404b
 preload files usually exist.  See also
f4404b
-sysctl
f4404b
+.B sysctl
f4404b
 option
f4404b
 .IR \-\-system .
f4404b
 .SH SEE ALSO
f4404b
diff -up ./sysctl.c.ori ./sysctl.c
f4404b
--- ./sysctl.c.ori	2018-05-17 13:23:41.574213737 +0200
f4404b
+++ ./sysctl.c	2022-07-29 16:33:02.907648980 +0200
f4404b
@@ -614,8 +614,8 @@ static int PreloadSystem(void)
f4404b
 {
f4404b
 	unsigned di, i;
f4404b
 	const char *dirs[] = {
f4404b
-		"/run/sysctl.d",
f4404b
 		"/etc/sysctl.d",
f4404b
+		"/run/sysctl.d",
f4404b
 		"/usr/local/lib/sysctl.d",
f4404b
 		"/usr/lib/sysctl.d",
f4404b
 		"/lib/sysctl.d",