[Toybox] [PATCH] modprobe: don't return failure just because we didn't find global config.

enh enh at google.com
Tue Jan 8 16:26:18 PST 2019


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.
---
 toys/pending/modprobe.c | 4 ++--
 1 file 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);
-- 
2.20.1.97.g81188d93c3-goog
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-modprobe-don-t-return-failure-just-because-we-didn-t.patch
Type: text/x-patch
Size: 1171 bytes
Desc: not available
URL: <http://lists.landley.net/pipermail/toybox-landley.net/attachments/20190108/07a8c04f/attachment-0002.bin>


More information about the Toybox mailing list