chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
84bccb4
)
sysctl: apply /etc/sysctl.conf last
author
Ludwig Nussel
<ludwig.nussel@suse.de>
Mon, 16 May 2011 09:11:52 +0000
(11:11 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Mon, 16 May 2011 21:36:52 +0000
(23:36 +0200)
apply /etc/sysctl.conf last to actually allow the admin to override
package provided defaults.
src/sysctl.c
patch
|
blob
|
history
diff --git
a/src/sysctl.c
b/src/sysctl.c
index 09c0a6a6152f7cef987702d571ce75ca271193bc..76ce9d864067f196f29e6c3327215d5a6cfe8d39 100644
(file)
--- a/
src/sysctl.c
+++ b/
src/sysctl.c
@@
-138,7
+138,6
@@
int main(int argc, char *argv[]) {
else {
char **files, **f;
- apply_file("/etc/sysctl.conf", true);
r = conf_files_list(&files, ".conf",
"/run/sysctl.d",
@@
-160,6
+159,8
@@
int main(int argc, char *argv[]) {
r = k;
}
+ apply_file("/etc/sysctl.conf", true);
+
strv_free(files);
}
finish: