diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-01-09 20:57:52 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-01-09 20:57:52 +0100 |
| commit | e9d12b57bfb941e754d09a7d5f54c183ca7dbb25 (patch) | |
| tree | 1b6240266c894f17dc0b34ab61ea75d05e47d223 /modutils | |
| parent | 642e71a789156a96bcb18e6c5a0f52416c49d3b5 (diff) | |
| download | busybox-w32-e9d12b57bfb941e754d09a7d5f54c183ca7dbb25.tar.gz busybox-w32-e9d12b57bfb941e754d09a7d5f54c183ca7dbb25.tar.bz2 busybox-w32-e9d12b57bfb941e754d09a7d5f54c183ca7dbb25.zip | |
modprobe-small: support compressed modules in insmod
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 | ||
