aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2009-01-12 17:24:04 -0500
committerH. Peter Anvin <hpa@linux.intel.com>2009-01-12 17:34:31 -0500
commit23a22d57a8962479ca630c9542e62d6f86fdf927 (patch)
tree5839f8f3125a7ddf90eb6c679908206ba464b7af /init
parent736f93236ce786d1bcf09ad4dcb38a360d35ea1b (diff)
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.c5
-rw-r--r--init/initramfs.c12
2 files changed, 15 insertions, 2 deletions
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
index a015e267fd17..91d0cfca5071 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)
79 sys_read(fd, buf, size); 79 sys_read(fd, buf, size);
80 80
81 *decompressor = decompress_method(buf, size, &compress_name); 81 *decompressor = decompress_method(buf, size, &compress_name);
82 if (*decompressor) { 82 if (compress_name) {
83 printk(KERN_NOTICE "RAMDISK: %s image found at block %d\n", 83 printk(KERN_NOTICE "RAMDISK: %s image found at block %d\n",
84 compress_name, start_block); 84 compress_name, start_block);
85 if (!*decompressor)
86 printk(KERN_CRIT "RAMDISK: %s decompressor not configured!\n",
87 compress_name);
85 nblocks = 0; 88 nblocks = 0;
86 goto done; 89 goto done;
87 } 90 }
diff --git a/init/initramfs.c b/init/initramfs.c
index 76f4a0125338..9a7290ec8187 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)
421{ 421{
422 int written; 422 int written;
423 decompress_fn decompress; 423 decompress_fn decompress;
424 const char *compress_name;
425 static __initdata char msg_buf[64];
424 426
425 dry_run = check_only; 427 dry_run = check_only;
426 header_buf = kmalloc(110, GFP_KERNEL); 428 header_buf = kmalloc(110, GFP_KERNEL);
@@ -449,10 +451,18 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
449 continue; 451 continue;
450 } 452 }
451 this_header = 0; 453 this_header = 0;
452 decompress = decompress_method(buf, len, NULL); 454 decompress = decompress_method(buf, len, &compress_name);
453 if (decompress) 455 if (decompress)
454 decompress(buf, len, NULL, flush_buffer, NULL, 456 decompress(buf, len, NULL, flush_buffer, NULL,
455 &my_inptr, error); 457 &my_inptr, error);
458 else if (compress_name) {
459 if (!message) {
460 snprintf(msg_buf, sizeof msg_buf,
461 "compression method %s not configured",
462 compress_name);
463 message = msg_buf;
464 }
465 }
456 if (state != Reset) 466 if (state != Reset)
457 error("junk in compressed archive"); 467 error("junk in compressed archive");
458 this_header = saved_offset + my_inptr; 468 this_header = saved_offset + my_inptr;