Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6aa7a29a authored by Daniel M. Weeks's avatar Daniel M. Weeks Committed by Linus Torvalds
Browse files

initramfs: debug detected compression method 



This can greatly aid in narrowing down the real source of initramfs
problems such as failures related to the compression of the in-kernel
initramfs when an external initramfs is in use as well.  Existing errors
are ambiguous as to which initramfs is a problem and why.

[akpm@linux-foundation.org: use pr_debug()]
Signed-off-by: default avatarDaniel M. Weeks <dan@danweeks.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 16caed31

init/initramfs.c

+1 −0
Original line number Diff line number Diff line
@@ -455,6 +455,7 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len) 
		}

		this_header = 0;

		decompress = decompress_method(buf, len, &compress_name);

		pr_debug("Detected %s compressed data\n", compress_name);

		if (decompress) {

			res = decompress(buf, len, NULL, flush_buffer, NULL,

				   &my_inptr, error);

lib/decompress.c

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/types.h>

#include <linux/string.h>

#include <linux/init.h>

#include <linux/printk.h>



#ifndef CONFIG_DECOMPRESS_GZIP

# define gunzip NULL
@@ -61,6 +62,8 @@ decompress_fn __init decompress_method(const unsigned char *inbuf, int len, 
	if (len < 2)

		return NULL;	/* Need at least this much... */



	pr_debug("Compressed data magic: %#.2x %#.2x\n", inbuf[0], inbuf[1]);



	for (cf = compressed_formats; cf->name; cf++) {

		if (!memcmp(inbuf, cf->magic, 2))

			break;