[PATCH] initramfs: Debug detected compression method

Daniel M. Weeks
2014-02-15T23:28:53Z

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.

Signed-off-by: Daniel M. Weeks <dan@danweeks.net>
---
init/initramfs.c | 1 +
lib/decompress.c | 4 ++++
2 files changed, 5 insertions(+)

diff --git a/init/initramfs.c b/init/initramfs.c
index 93b6139..25d88b1 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -455,6 +455,7 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len)
}
this_header = 0;
decompress = decompress_method(buf, len, &compress_name);
+ printk(KERN_DEBUG "Detected %s compressed data\n", compress_name);
if (decompress) {
res = decompress(buf, len, NULL, flush_buffer, NULL,
&my_inptr, error);
diff --git a/lib/decompress.c b/lib/decompress.c
index 4d1cd03..fc508fd 100644
--- a/lib/decompress.c
+++ b/lib/decompress.c
@@ -17,6 +17,8 @@
#include <linux/string.h>
#include <linux/init.h>

+#include <linux/printk.h>
+
#ifndef CONFIG_DECOMPRESS_GZIP
# define gunzip NULL
#endif
@@ -61,6 +63,8 @@ decompress_fn __init decompress_method(const unsigned char *inbuf, int len,
if (len < 2)
return NULL; /* Need at least this much... */

+ printk(KERN_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;
--
Daniel M. Weeks