pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "toolbox/modprobe: Fallback to /lib/modules/<uname>"

This commit is contained in:
Vincent Donnefort 2023-01-27 17:35:01 +00:00 committed by Gerrit Code Review
parent 545141f405 8320778425
commit d34157e26e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
toolbox/modprobe.cpp
View File

@ -23,8 +23,11 @@
#include <android-base/file.h>
#include <android-base/logging.h>
#include <android-base/strings.h>
#include <android-base/stringprintf.h>
#include <modprobe/modprobe.h>
#include <sys/utsname.h>
namespace {
enum modprobe_mode {
@ -37,9 +40,8 @@ enum modprobe_mode {
void print_usage(void) {
LOG(INFO) << "Usage:";
LOG(INFO);
// -d option is required on Android
LOG(INFO) << " modprobe [options] -d DIR [--all=FILE|MODULE]...";
LOG(INFO) << " modprobe [options] -d DIR MODULE [symbol=value]...";
LOG(INFO) << " modprobe [options] [-d DIR] [--all=FILE|MODULE]...";
LOG(INFO) << " modprobe [options] [-d DIR] MODULE [symbol=value]...";
LOG(INFO);
LOG(INFO) << "Options:";
LOG(INFO) << " --all=FILE: FILE to acquire module names from";
@ -189,6 +191,12 @@ extern "C" int modprobe_main(int argc, char** argv) {
}
}
if (mod_dirs.empty()) {
utsname uts;
uname(&uts);
mod_dirs.emplace_back(android::base::StringPrintf("/lib/modules/%s", uts.release));
}
LOG(DEBUG) << "mode is " << mode;
LOG(DEBUG) << "mod_dirs is: " << android::base::Join(mod_dirs, " ");
LOG(DEBUG) << "modules is: " << android::base::Join(modules, " ");