From: Michael Prokop <mika@grml.org>
Date: Mon, 26 Nov 2007 00:03:08 +0000 (+0100)
Subject: libvolume_id: squashfs+LZMA compression detection
X-Git-Tag: 174~1780
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=d7515c7bb95748f3afc2156451dd10f3e0ee4c84;ds=sidebyside

libvolume_id: squashfs+LZMA compression detection
---

diff --git a/extras/volume_id/lib/squashfs.c b/extras/volume_id/lib/squashfs.c
index 402a114e1..70b322df0 100644
--- a/extras/volume_id/lib/squashfs.c
+++ b/extras/volume_id/lib/squashfs.c
@@ -27,6 +27,7 @@
 #include "util.h"
 
 #define SQUASHFS_MAGIC		0x73717368
+#define SQUASHFS_MAGIC_LZMA	0x73687371
 
 struct squashfs_super {
 	uint32_t	s_magic;
@@ -60,6 +61,11 @@ int volume_id_probe_squashfs(struct volume_id *id, uint64_t off, uint64_t size)
 			 bswap_16(sqs->s_major), bswap_16(sqs->s_minor));
 		goto found;
 	}
+	if (sqs->s_magic == bswap_32(SQUASHFS_MAGIC_LZMA)) {
+		snprintf(id->type_version, sizeof(id->type_version), "%u.%u",
+		sqs->s_major, sqs->s_minor);
+		goto found;
+	}
 
 	return -1;