495de5dd2a
Revert, see https://bugzilla.opensuse.org/show_bug.cgi?id=1198266 OBS-URL: https://build.opensuse.org/request/show/969331 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/procps?expand=0&rev=127
52 lines
1.2 KiB
Diff
52 lines
1.2 KiB
Diff
---
|
|
sysctl.8 | 2 ++
|
|
sysctl.c | 12 ++++++++++++
|
|
2 files changed, 14 insertions(+)
|
|
|
|
--- sysctl.8
|
|
+++ sysctl.8 2021-02-10 10:05:27.781748090 +0000
|
|
@@ -81,6 +81,8 @@ directories in the following list in giv
|
|
Once a file of a given filename is loaded, any file of the same name
|
|
in subsequent directories is ignored.
|
|
.br
|
|
+/boot/sysctl.conf-<kernelversion>
|
|
+.br
|
|
/etc/sysctl.d/*.conf
|
|
.br
|
|
/run/sysctl.d/*.conf
|
|
--- sysctl.c
|
|
+++ sysctl.c 2021-02-10 10:04:25.290952318 +0000
|
|
@@ -39,6 +39,7 @@
|
|
#include <string.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/types.h>
|
|
+#include <sys/utsname.h>
|
|
#include <unistd.h>
|
|
|
|
#include "c.h"
|
|
@@ -621,6 +622,7 @@ static int sortpairs(const void *A, cons
|
|
static int PreloadSystem(void)
|
|
{
|
|
unsigned di, i;
|
|
+ struct utsname uts;
|
|
const char *dirs[] = {
|
|
"/etc/sysctl.d",
|
|
"/run/sysctl.d",
|
|
@@ -685,6 +687,16 @@ static int PreloadSystem(void)
|
|
}
|
|
qsort(cfgs, ncfgs, sizeof(struct cfg *), sortpairs);
|
|
|
|
+ if (uname(&uts) == 0) {
|
|
+ char buf[PATH_MAX];
|
|
+ snprintf(buf, sizeof(buf), "/boot/sysctl.conf-%s", uts.release);
|
|
+ if (access(buf, R_OK) == 0) {
|
|
+ if (!Quiet)
|
|
+ printf("* Applying %s ...\n", buf);
|
|
+ Preload(buf);
|
|
+ }
|
|
+ }
|
|
+
|
|
for (i = 0; i < ncfgs; ++i) {
|
|
if (!Quiet)
|
|
printf(_("* Applying %s ...\n"), cfgs[i]->value);
|