From: Karel Zak <kzak@redhat.com>
Date: Tue, 15 Dec 2009 10:55:27 +0000 (+0100)
Subject: libblkid: fix highpoint37x detection
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f0eb081ffb7735006dd5641360c1dcfdbcc4cc4;p=util-linux

libblkid: fix highpoint37x detection

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/shlibs/blkid/src/superblocks/highpoint_raid.c b/shlibs/blkid/src/superblocks/highpoint_raid.c
index 4b4b8511..0d948462 100644
--- a/shlibs/blkid/src/superblocks/highpoint_raid.c
+++ b/shlibs/blkid/src/superblocks/highpoint_raid.c
@@ -55,8 +55,15 @@ const struct blkid_idinfo highpoint37x_idinfo = {
 	.name		= "highpoint_raid_member",
 	.usage		= BLKID_USAGE_RAID,
 	.magics		= {
-		{ .magic = "\xf0\x16\x78\x5a", .len = 4, .kboff = 4 },
-		{ .magic = "\xfd\x16\x78\x5a", .len = 4, .kboff = 4 },
+		/*
+		 * Superblok offset:                      4608 bytes  (9 sectors)
+		 * Magic string offset within superblock:   32 bytes
+		 *
+		 * kboff = (4608 + 32) / 1024
+		 * sboff = (4608 + 32) % kboff
+		 */
+		{ .magic = "\xf0\x16\x78\x5a", .len = 4, .kboff = 4, .sboff = 544 },
+		{ .magic = "\xfd\x16\x78\x5a", .len = 4, .kboff = 4, .sboff = 544 },
 		{ NULL }
 	}
 };