diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-01-16 20:00:24 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-01-16 20:00:24 +0100 |
commit | 12d97b66805f87e535962963e858fc2422ffdbc7 (patch) | |
tree | 10836c6158a05a505d8a7cb83313cc908e837a50 /modutils | |
parent | 2a1571bfa003233470140a17be4ae4f0239f5a24 (diff) | |
download | busybox-w32-1_18_2.tar.gz busybox-w32-1_18_2.tar.bz2 busybox-w32-1_18_2.zip |
apply post-1.18.1 patches, bump version to 1.18.21_18_2
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'modutils')
-rw-r--r-- | modutils/modprobe-small.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c index ec3ddfb8f..f4f17e766 100644 --- a/modutils/modprobe-small.c +++ b/modutils/modprobe-small.c | |||
@@ -844,13 +844,15 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv) | |||
844 | void *map; | 844 | void *map; |
845 | 845 | ||
846 | len = MAXINT(ssize_t); | 846 | len = MAXINT(ssize_t); |
847 | map = xmalloc_xopen_read_close(*argv, &len); | 847 | map = xmalloc_open_zipped_read_close(*argv, &len); |
848 | if (init_module(map, len, | 848 | if (init_module(map, len, |
849 | IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(options ? options : "") | 849 | IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(options ? options : "") |
850 | IF_NOT_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE("") | 850 | IF_NOT_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE("") |
851 | ) != 0) | 851 | ) != 0 |
852 | ) { | ||
852 | bb_error_msg_and_die("can't insert '%s': %s", | 853 | bb_error_msg_and_die("can't insert '%s': %s", |
853 | *argv, moderror(errno)); | 854 | *argv, moderror(errno)); |
855 | } | ||
854 | return 0; | 856 | return 0; |
855 | } | 857 | } |
856 | 858 | ||