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 (from parent 1:
fd5bf05
)
modules-load: use /etc/modules-load.d/?*.conf
author
Kay Sievers
<kay.sievers@vrfy.org>
Tue, 28 Sep 2010 15:02:29 +0000
(17:02 +0200)
committer
Kay Sievers
<kay.sievers@vrfy.org>
Tue, 28 Sep 2010 15:02:29 +0000
(17:02 +0200)
src/modules-load.c
patch
|
blob
|
history
diff --git
a/src/modules-load.c
b/src/modules-load.c
index 56f2a907f4cc2a68a7450078c24b4faacd688052..a1738bb8b4f25e04d48b094830f1de41ec05a2f6 100644
(file)
--- a/
src/modules-load.c
+++ b/
src/modules-load.c
@@
-31,7
+31,7
@@
#include "util.h"
#include "strv.h"
#include "util.h"
#include "strv.h"
-/* This reads all module names listed in /etc/modules.d/?*.conf and
+/* This reads all module names listed in /etc/modules
-load
.d/?*.conf and
* loads them into the kernel. This follows roughly Debian's way to
* handle modules, but uses a directory of fragments instead of a
* single /etc/modules file. */
* loads them into the kernel. This follows roughly Debian's way to
* handle modules, but uses a directory of fragments instead of a
* single /etc/modules file. */
@@
-71,12
+71,12
@@
int main(int argc, char *argv[]) {
n_arguments = n_allocated = 3;
n_arguments = n_allocated = 3;
- if ((n = scandir("/etc/modules.d/", &de, scandir_filter, alphasort)) < 0) {
+ if ((n = scandir("/etc/modules
-load
.d/", &de, scandir_filter, alphasort)) < 0) {
if (errno == ENOENT)
r = EXIT_SUCCESS;
else
if (errno == ENOENT)
r = EXIT_SUCCESS;
else
- log_error("Failed to enumerate /etc/modules.d/ files: %m");
+ log_error("Failed to enumerate /etc/modules
-load
.d/ files: %m");
goto finish;
}
goto finish;
}
@@
-88,7
+88,7
@@
int main(int argc, char *argv[]) {
char *fn;
FILE *f;
char *fn;
FILE *f;
- k = asprintf(&fn, "/etc/modules.d/%s", de[i]->d_name);
+ k = asprintf(&fn, "/etc/modules
-load
.d/%s", de[i]->d_name);
free(de[i]);
if (k < 0) {
free(de[i]);
if (k < 0) {