From a8a47037d1920334f3bad98868bf24fddc9f86fc Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com>
Date: Wed, 6 Dec 2006 20:37:19 -0800
Subject: [PATCH] --- yaml --- r: 42831 b: refs/heads/master c:
 2e591bbc0d563e12f5a260fbbca0df7d5810910e h: refs/heads/master i:   42829:
 deac59bdf4e422549847080e5a458406320db2bb   42827:
 3dedb9f710382d2ee958a3688ce7afdba733e4d8   42823:
 83bf5302598dc5b556d30fa83cffddcf6f5173bf   42815:
 5f72f0cb19743c2a3de58a54fec1d428145449ae v: v3

---
 [refs]                 | 2 +-
 trunk/init/initramfs.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ad9170e7d8a4..99d79902af19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6337e2af42f9ea9ce296cfa18966dcf4f045f7d
+refs/heads/master: 2e591bbc0d563e12f5a260fbbca0df7d5810910e
diff --git a/trunk/init/initramfs.c b/trunk/init/initramfs.c
index d28c1094d7e5..85f04037ade1 100644
--- a/trunk/init/initramfs.c
+++ b/trunk/init/initramfs.c
@@ -182,6 +182,10 @@ static int __init do_collect(void)
 
 static int __init do_header(void)
 {
+	if (memcmp(collected, "070707", 6)==0) {
+		error("incorrect cpio method used: use -H newc option");
+		return 1;
+	}
 	if (memcmp(collected, "070701", 6)) {
 		error("no cpio magic");
 		return 1;