aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKel Modderman <kel@otaku42.de>2007-12-11 19:41:29 +1000
committermaximilian attems <max@stro.at>2007-12-11 12:19:35 +0100
commitc6928e4ecc9306eebdf680e89e2c1caa438646b1 (patch)
tree49b11491c949150fd2b327ec4261484960996473
parent83cd38f8cc2a04ef6d4ce96de719c993edd7fbfb (diff)
downloadklibc-c6928e4ecc9306eebdf680e89e2c1caa438646b1.tar.gz
[klibc] fstype add squashfs-lzma magicklibc-1.5.8
Add squashfs-lzma support to fstype. Signed-off-by: maximilian attems <max@stro.at>
-rw-r--r--usr/kinit/fstype/fstype.c4
-rw-r--r--usr/kinit/fstype/squashfs_fs.h7
2 files changed, 10 insertions, 1 deletions
diff --git a/usr/kinit/fstype/fstype.c b/usr/kinit/fstype/fstype.c
index 2f219e63b9afb..ea7171b3e7099 100644
--- a/usr/kinit/fstype/fstype.c
+++ b/usr/kinit/fstype/fstype.c
@@ -292,7 +292,9 @@ static int squashfs_image(const void *buf, unsigned long long *blocks)
(const struct squashfs_super_block *)buf;
if (sb->s_magic == SQUASHFS_MAGIC
- || sb->s_magic == SQUASHFS_MAGIC_SWAP) {
+ || sb->s_magic == SQUASHFS_MAGIC_SWAP
+ || sb->s_magic == SQUASHFS_MAGIC_LZMA
+ || sb->s_magic == SQUASHFS_MAGIC_LZMA_SWAP) {
*blocks = (unsigned long long) sb->bytes_used;
return 1;
}
diff --git a/usr/kinit/fstype/squashfs_fs.h b/usr/kinit/fstype/squashfs_fs.h
index 017b8a50bf72f..c18365d2564de 100644
--- a/usr/kinit/fstype/squashfs_fs.h
+++ b/usr/kinit/fstype/squashfs_fs.h
@@ -8,6 +8,13 @@
#define SQUASHFS_MAGIC 0x73717368
#define SQUASHFS_MAGIC_SWAP 0x68737173
+/*
+ * Squashfs + LZMA
+ */
+
+#define SQUASHFS_MAGIC_LZMA 0x71736873
+#define SQUASHFS_MAGIC_LZMA_SWAP 0x73687371
+
/* definitions for structures on disk */
struct squashfs_super_block {
unsigned int s_magic;