chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nspawn: Move the get_user_creds from execute.c to utils.c for later usage in nspawn.c.
[elogind.git]
/
src
/
sysctl.c
diff --git
a/src/sysctl.c
b/src/sysctl.c
index 814cfea592743606d56d5012c60688ef4be40bc6..76ce9d864067f196f29e6c3327215d5a6cfe8d39 100644
(file)
--- a/
src/sysctl.c
+++ b/
src/sysctl.c
@@
-138,12
+138,13
@@
int main(int argc, char *argv[]) {
else {
char **files, **f;
else {
char **files, **f;
- apply_file("/etc/sysctl.conf", true);
r = conf_files_list(&files, ".conf",
"/run/sysctl.d",
"/etc/sysctl.d",
r = conf_files_list(&files, ".conf",
"/run/sysctl.d",
"/etc/sysctl.d",
+ "/usr/local/lib/sysctl.d",
"/usr/lib/sysctl.d",
"/usr/lib/sysctl.d",
+ "/lib/sysctl.d",
NULL);
if (r < 0) {
log_error("Failed to enumerate sysctl.d files: %s", strerror(-r));
NULL);
if (r < 0) {
log_error("Failed to enumerate sysctl.d files: %s", strerror(-r));
@@
-158,6
+159,8
@@
int main(int argc, char *argv[]) {
r = k;
}
r = k;
}
+ apply_file("/etc/sysctl.conf", true);
+
strv_free(files);
}
finish:
strv_free(files);
}
finish: