aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2019-01-08 16:24:17 -0800
committerRob Landley <rob@landley.net>2019-01-08 19:22:24 -0600
commit0a3809566e651e0e224e3781b126542a22286492 (patch)
tree21e31028f3837e85bdcbce6928ec772e22e2abe2
parent93e1b9ecb17481a15f4681d07125892c16eeb10b (diff)
downloadtoybox-0a3809566e651e0e224e3781b126542a22286492.tar.gz
modprobe: don't return failure just because we didn't find global config.
Without this change, a successful modprobe on Android exits with status 1 because Android doesn't have /etc/modprobe.conf or /etc/modprobe.d/ --- neither of which seem to be required on desktop Linux either.
-rw-r--r--toys/pending/modprobe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/toys/pending/modprobe.c b/toys/pending/modprobe.c
index cbcfac8f..923026ba 100644
--- a/toys/pending/modprobe.c
+++ b/toys/pending/modprobe.c
@@ -553,8 +553,8 @@ void modprobe_main(void)
if (toys.optflags&FLAG_v) puts("All modules loaded");
return;
}
- dirtree_read("/etc/modprobe.conf", config_action);
- dirtree_read("/etc/modprobe.d", config_action);
+ dirtree_flagread("/etc/modprobe.conf", DIRTREE_SHUTUP, config_action);
+ dirtree_flagread("/etc/modprobe.d", DIRTREE_SHUTUP, config_action);
for (dirs = TT.dirs; dirs; dirs = dirs->next) {
xchdir(dirs->arg);