chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import udev repository
[elogind.git]
/
src
/
sysctl.c
diff --git
a/src/sysctl.c
b/src/sysctl.c
index 9f7acfce8b09f76d67247c0d82caa2c35baed5aa..17c6719841bacce1c70399fd3c303678a1a828c3 100644
(file)
--- a/
src/sysctl.c
+++ b/
src/sysctl.c
@@
-219,26
+219,34
@@
int main(int argc, char *argv[]) {
if (r <= 0)
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
if (r <= 0)
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
- if (argc-optind > 1) {
- log_error("This program expects one or no arguments.");
- return EXIT_FAILURE;
- }
-
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();
- if (argc > optind)
- r = apply_file(argv[optind], false);
- else {
+ umask(0022);
+
+ if (argc > optind) {
+ int i;
+
+ for (i = optind; i < argc; i++) {
+ int k;
+
+ k = apply_file(argv[i], false);
+ if (k < 0 && r == 0)
+ r = k;
+ }
+ } else {
char **files, **f;
char **files, **f;
+ int k;
r = conf_files_list(&files, ".conf",
r = conf_files_list(&files, ".conf",
- "/run/sysctl.d",
"/etc/sysctl.d",
"/etc/sysctl.d",
+ "/run/sysctl.d",
"/usr/local/lib/sysctl.d",
"/usr/lib/sysctl.d",
"/usr/local/lib/sysctl.d",
"/usr/lib/sysctl.d",
+#ifdef HAVE_SPLIT_USR
"/lib/sysctl.d",
"/lib/sysctl.d",
+#endif
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));
@@
-246,14
+254,14
@@
int main(int argc, char *argv[]) {
}
STRV_FOREACH(f, files) {
}
STRV_FOREACH(f, files) {
- int k;
-
k = apply_file(*f, true);
if (k < 0 && r == 0)
r = k;
}
k = apply_file(*f, true);
if (k < 0 && r == 0)
r = k;
}
- apply_file("/etc/sysctl.conf", true);
+ k = apply_file("/etc/sysctl.conf", true);
+ if (k < 0 && r == 0)
+ r = k;
strv_free(files);
}
strv_free(files);
}