diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-01-12 14:24:04 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-01-12 14:34:31 -0800 |
| commit | 23a22d57a8962479ca630c9542e62d6f86fdf927 (patch) | |
| tree | 5839f8f3125a7ddf90eb6c679908206ba464b7af /init | |
| parent | 736f93236ce786d1bcf09ad4dcb38a360d35ea1b (diff) | |
| download | linux-3.10-23a22d57a8962479ca630c9542e62d6f86fdf927.tar.gz linux-3.10-23a22d57a8962479ca630c9542e62d6f86fdf927.tar.bz2 linux-3.10-23a22d57a8962479ca630c9542e62d6f86fdf927.zip | |
bzip2/lzma: comprehensible error messages for missing decompressor
Instead of failing to identify a compressed image with a decompressor
that we don't have compiled in, identify it and fail with a
comprehensible panic message.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'init')
| -rw-r--r-- | init/do_mounts_rd.c | 5 | ||||
| -rw-r--r-- | init/initramfs.c | 12 |
2 files changed, 15 insertions, 2 deletions
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c index a015e267fd1..91d0cfca507 100644 --- a/init/do_mounts_rd.c +++ b/init/do_mounts_rd.c @@ -79,9 +79,12 @@ identify_ramdisk_image(int fd, int start_block, decompress_fn *decompressor) sys_read(fd, buf, size); *decompressor = decompress_method(buf, size, &compress_name); - if (*decompressor) { + if (compress_name) { printk(KERN_NOTICE "RAMDISK: %s image found at block %d\n", compress_name, start_block); + if (!*decompressor) + printk(KERN_CRIT "RAMDISK: %s decompressor not configured!\n", + compress_name); nblocks = 0; goto done; } diff --git a/init/initramfs.c b/init/initramfs.c index 76f4a012533..9a7290ec818 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -421,6 +421,8 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only) { int written; decompress_fn decompress; + const char *compress_name; + static __initdata char msg_buf[64]; dry_run = check_only; header_buf = kmalloc(110, GFP_KERNEL); @@ -449,10 +451,18 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only) continue; } this_header = 0; - decompress = decompress_method(buf, len, NULL); + decompress = decompress_method(buf, len, &compress_name); if (decompress) decompress(buf, len, NULL, flush_buffer, NULL, &my_inptr, error); + else if (compress_name) { + if (!message) { + snprintf(msg_buf, sizeof msg_buf, + "compression method %s not configured", + compress_name); + message = msg_buf; + } + } if (state != Reset) error("junk in compressed archive"); this_header = saved_offset + my_inptr; |