aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandeep Patil <sspatil@google.com>2016-12-06 21:21:58 -0800
committerSteve Muckle <smuckle@google.com>2017-01-26 14:30:26 -0800
commit488b539f0d5bd6af4cb259caba7ff86d17f0fb72 (patch)
tree8eb34bc35b168ede3157d4bc29521487ac320322
parentcae4495189d228cd8938ce51c8c771502b053ef1 (diff)
downloadtoybox-488b539f0d5bd6af4cb259caba7ff86d17f0fb72.tar.gz
Add modprobe
Bug: http://b/33304485 Change-Id: Ic37aad18b4c05f3808de51ccab2676009afb4404 Signed-off-by: Sandeep Patil <sspatil@google.com>
-rw-r--r--.config2
-rw-r--r--Android.mk2
-rw-r--r--generated/config.h4
3 files changed, 5 insertions, 3 deletions
diff --git a/.config b/.config
index 3274e115..dea725ce 100644
--- a/.config
+++ b/.config
@@ -163,8 +163,8 @@ CONFIG_LSOF=y
# CONFIG_MKE2FS_GEN is not set
# CONFIG_MKE2FS_LABEL is not set
# CONFIG_MKE2FS_EXTENDED is not set
-# CONFIG_MODPROBE is not set
CONFIG_MICROCOM=y
+CONFIG_MODPROBE=y
CONFIG_MORE=y
CONFIG_NETSTAT=y
# CONFIG_OPENVT is not set
diff --git a/Android.mk b/Android.mk
index 5a50d74e..d00ba175 100644
--- a/Android.mk
+++ b/Android.mk
@@ -144,6 +144,7 @@ LOCAL_SRC_FILES := \
toys/pending/expr.c \
toys/pending/getfattr.c \
toys/pending/lsof.c \
+ toys/pending/modprobe.c \
toys/pending/more.c \
toys/pending/setfattr.c \
toys/pending/tar.c \
@@ -310,6 +311,7 @@ ALL_TOOLS := \
mktemp \
microcom \
modinfo \
+ modprobe \
more \
mount \
mountpoint \
diff --git a/generated/config.h b/generated/config.h
index 51126752..4aba662c 100644
--- a/generated/config.h
+++ b/generated/config.h
@@ -304,10 +304,10 @@
#define USE_MKE2FS_LABEL(...)
#define CFG_MKE2FS_EXTENDED 0
#define USE_MKE2FS_EXTENDED(...)
-#define CFG_MODPROBE 0
-#define USE_MODPROBE(...)
#define CFG_MICROCOM 1
#define USE_MICROCOM(...) __VA_ARGS__
+#define CFG_MODPROBE 1
+#define USE_MODPROBE(...) __VA_ARGS__
#define CFG_MORE 1
#define USE_MORE(...) __VA_ARGS__
#define CFG_NETSTAT 1