Commit: 7d406cb654028a11841908999e0d7189edf6f970 - system-coremmmm (git)

system/corennnnn

Commit MetaInfo

• Revision: 7d406cb654028a11841908999e0d7189edf6f970 (tree)
• Time: 2016-07-27 03:54:20
• Author: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Jaap Jan Meijer

Log Message

init: add modprobe to load kernel requested modules

Change Summary

• modified: init/Android.mk
• modified: init/init.cpp

Incremental Difference

--- a/init/Android.mk
+++ b/init/Android.mk
@@ -104,6 +104,7 @@ LOCAL_STATIC_LIBRARIES := \
 
 # Create symlinks
 LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT)/sbin; \
+    ln -sf ../init $(TARGET_ROOT_OUT)/sbin/modprobe; \
     ln -sf ../init $(TARGET_ROOT_OUT)/sbin/ueventd; \
     ln -sf ../init $(TARGET_ROOT_OUT)/sbin/watchdogd
 

--- a/init/init.cpp
+++ b/init/init.cpp
@@ -59,6 +59,7 @@
 #include "bootchart.h"
 #include "signal_handler.h"
 #include "keychords.h"
+#include "keywords.h"
 #include "init_parser.h"
 #include "util.h"
 #include "ueventd.h"
@@ -1020,7 +1021,37 @@ static int charging_mode_booting(void) {
 #endif
 }
 
+int modprobe_main(int argc, char **argv)
+{
+    char *prog = argv[0];
+
+    /* We only accept requests from root user (kernel) */
+    if (getuid())
+        return -EPERM;
+
+    /* Kernel will launch a user space program specified by
+     * /proc/sys/kernel/modprobe to load modules.
+     * No deferred loading in this case.
+     */
+    while (argc > 1 && (!strcmp(argv[1], "-q") || !strcmp(argv[1], "--"))) {
+        klog_set_level(KLOG_NOTICE_LEVEL);
+        argc--, argv++;
+    }
+
+    if (argc < 2) {
+        /* it is called without enough arguments */
+        return -EINVAL;
+    }
+
+    NOTICE("%s %s\n", prog, argv[1]);
+    return module_probe(argv[1]) ? do_probemod(argc, argv) : 0;
+}
+
 int main(int argc, char** argv) {
+    if (strstr(argv[0], "modprobe")) {
+        return modprobe_main(argc, argv);
+    }
+
     if (!strcmp(basename(argv[0]), "ueventd")) {
         return ueventd_main(argc, argv);
     }