PWN-Hunter/android_external_toybox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modprobe: don't return failure just because we didn't find global config.

Browse Source 
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.
This commit is contained in:
Elliott Hughes 2019-01-08 16:24:17 -08:00 committed by Rob Landley
parent 93e1b9ecb1
commit 0a3809566e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toys/pending/modprobe.c
View File

@ -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);