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

sysctl --system loads default config file

Browse Source 
Commit cdca71e945 fixed
the loading the sysctl.conf file, but had the logic
for checking the file exists reversed incorrectly.
This commit is contained in:
Craig Small 2013-12-27 23:08:14 +11:00
parent 14ef47af57
commit 7f6efed9bb
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -1,3 +1,7 @@
procps-ng-3.3.10
----------------
* sysctl --system loads default config file - Debian #732920
procps-ng-3.3.9 procps-ng-3.3.9
--------------- ---------------
* kernel namespaces support added to skill, pgrep, ps and top * kernel namespaces support added to skill, pgrep, ps and top

2
sysctl.c
View File

@ -640,7 +640,7 @@ static int PreloadSystem(void)
} }
if (stat(DEFAULT_PRELOAD, &ts) < 0 && S_ISREG(ts.st_mode)) { if (stat(DEFAULT_PRELOAD, &ts) < 0 || S_ISREG(ts.st_mode)) {
if (!Quiet) if (!Quiet)
printf(_("* Applying %s ...\n"), DEFAULT_PRELOAD); printf(_("* Applying %s ...\n"), DEFAULT_PRELOAD);
rc |= Preload(DEFAULT_PRELOAD); rc |= Preload(DEFAULT_PRELOAD);