summaryrefslogtreecommitdiff
path: root/modutils
diff options
context:
space:
mode:
authorKang-Che Sung2017-02-09 22:48:52 +0800
committerDenys Vlasenko2017-02-12 21:41:24 +0100
commitaf316aabf248a14d581aec6c3df1b814a35619af (patch)
tree5838e3f1a9abb76759c196845f9457324860b144 /modutils
parentc393b1e9193601e79ac83efb3b44a7227b9b8af9 (diff)
downloadbusybox-af316aabf248a14d581aec6c3df1b814a35619af.zip
busybox-af316aabf248a14d581aec6c3df1b814a35619af.tar.gz
modprobe-small: define and use DEPMOD_OPT_n (option mask)
Signed-off-by: Kang-Che Sung <explorer09@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'modutils')
-rw-r--r--modutils/modprobe-small.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index 0ac39f6..485ba43 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -79,6 +79,7 @@ int lsmod_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
#define is_rmmod (ENABLE_RMMOD && (ONLY_APPLET || applet_name[0] == 'r'))
enum {
+ DEPMOD_OPT_n = (1 << 0), /* dry-run, print to stdout */
OPT_q = (1 << 0), /* be quiet */
OPT_r = (1 << 1), /* module removal instead of loading */
};
@@ -477,7 +478,7 @@ static int start_dep_bb_writeout(void)
int fd;
/* depmod -n: write result to stdout */
- if (applet_name[0] == 'd' && (option_mask32 & 1))
+ if (is_depmod && (option_mask32 & DEPMOD_OPT_n))
return STDOUT_FILENO;
fd = open(DEPFILE_BB".new", O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0644);