shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00
Code

sysctl: apply /etc/sysctl.conf last

Browse Source 
apply /etc/sysctl.conf last to actually allow the admin to override
package provided defaults.
This commit is contained in:
Ludwig Nussel 2011-05-16 11:11:52 +02:00 committed by Lennart Poettering
parent 84bccb47a7
commit cb80401132
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/sysctl.c
View File

@ -138,7 +138,6 @@ int main(int argc, char *argv[]) {
else { else {
char **files, **f; char **files, **f;
apply_file("/etc/sysctl.conf", true);
r = conf_files_list(&files, ".conf", r = conf_files_list(&files, ".conf",
"/run/sysctl.d", "/run/sysctl.d",
@ -160,6 +159,8 @@ int main(int argc, char *argv[]) {
r = k; r = k;
} }
apply_file("/etc/sysctl.conf", true);
strv_free(files); strv_free(files);
} }
finish: finish: