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

sysctl --system ignores missing /etc/sysctl.conf

Browse Source 
sysctl --system would not correctly return the RC for files in
subdirectories and would insist on having /etc/sysctl.conf

This update makes two changes when using sysctl --system:
  - The RC status is ORed for each config file, meaning an error in
    any file is propated to the RC
  - If /etc/sysctl.conf doesn't exist we just don't load it

References:
  https://bbs.archlinux.org/viewtopic.php?id=170005
  http://www.freelists.org/post/procps/wrong-defaults-for-sysctl-on-arch-linux
This commit is contained in:
Craig Small 2013-09-20 22:34:32 +10:00
parent 4141efaf13
commit cdca71e945
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sysctl.c
View File

@ -578,6 +578,8 @@ static int PreloadSystem(void)
}; };
struct pair **cfgs = NULL; struct pair **cfgs = NULL;
unsigned ncfgs = 0; unsigned ncfgs = 0;
int rc = 0;
struct stat ts;
enum { nprealloc = 16 }; enum { nprealloc = 16 };
for (di = 0; di < sizeof(dirs) / sizeof(dirs[0]); ++di) { for (di = 0; di < sizeof(dirs) / sizeof(dirs[0]); ++di) {
@ -634,12 +636,16 @@ static int PreloadSystem(void)
for (i = 0; i < ncfgs; ++i) { for (i = 0; i < ncfgs; ++i) {
if (!Quiet) if (!Quiet)
printf(_("* Applying %s ...\n"), cfgs[i]->value); printf(_("* Applying %s ...\n"), cfgs[i]->value);
Preload(cfgs[i]->value); rc |= Preload(cfgs[i]->value);
} }
if (!Quiet)
printf(_("* Applying %s ...\n"), DEFAULT_PRELOAD); if (stat(DEFAULT_PRELOAD, &ts) < 0 && S_ISREG(ts.st_mode)) {
return Preload(DEFAULT_PRELOAD); if (!Quiet)
printf(_("* Applying %s ...\n"), DEFAULT_PRELOAD);
rc |= Preload(DEFAULT_PRELOAD);
}
return rc;
} }
/* /*