[prev in list] [next in list] [prev in thread] [next in thread]
List: busybox
Subject: [PATCH] volume_id: add squashfs detection
From: Sven-Göran_Bergh <svengbergh-busybox () yahoo ! com>
Date: 2012-11-15 15:02:42
Message-ID: 1352991762.24042.YahooMailNeo () web121805 ! mail ! ne1 ! yahoo ! com
[Download RAW message or body]
Add support for squashfs to blkid. Not included if FEATURE_BLKID_TYPE is not
selected (neither UUID nor label).
Brgds
/S-G
volume_id: add squashfs detection
function old new delta
volume_id_probe_squashfs - 139 +139
Signed-off-by: Sven-Göran Bergh <sgb@systemasis.org>
---
util-linux/Config.src | 10 +++++++
util-linux/volume_id/Kbuild.src | 1 +
util-linux/volume_id/squashfs.c | 41 +++++++++++++++++++++++++++++
util-linux/volume_id/volume_id.c | 3 ++
util-linux/volume_id/volume_id_internal.h | 2 +
5 files changed, 57 insertions(+), 0 deletions(-)
Patch attached
["busybox-1.20.2-volume_id-squashfs.patch" (application/octet-stream)]
commit 6abfabc3718381eba6114e4623b6a8700a8907b5
Author: Sven-Göran Bergh <sgb@systemasis.org>
Date: Thu Nov 15 15:04:33 2012 +0100
volume_id: add squashfs detection
function old new delta
volume_id_probe_squashfs - 139 +139
Signed-off-by: Sven-Göran Bergh <sgb@systemasis.org>
---
util-linux/Config.src | 10 +++++++
util-linux/volume_id/Kbuild.src | 1 +
util-linux/volume_id/squashfs.c | 41 +++++++++++++++++++++++++++++
util-linux/volume_id/volume_id.c | 3 ++
util-linux/volume_id/volume_id_internal.h | 2 +
5 files changed, 57 insertions(+), 0 deletions(-)
diff --git a/util-linux/Config.src b/util-linux/Config.src
index e4516dd..6c1b928 100644
--- a/util-linux/Config.src
+++ b/util-linux/Config.src
@@ -841,6 +841,16 @@ config FEATURE_VOLUMEID_ROMFS
help
TODO
+config FEATURE_VOLUMEID_SQUASHFS
+ bool "SquashFS filesystem"
+ default y
+ depends on VOLUMEID && FEATURE_BLKID_TYPE
+ help
+ Squashfs is a compressed read-only filesystem for Linux. Squashfs is
+ intended for general read-only filesystem use and in constrained block
+ device/memory systems (e.g. embedded systems) where low overhead is
+ needed.
+
config FEATURE_VOLUMEID_SYSV
bool "sysv filesystem"
default y
diff --git a/util-linux/volume_id/Kbuild.src b/util-linux/volume_id/Kbuild.src
index 759fdaa..ef09800 100644
--- a/util-linux/volume_id/Kbuild.src
+++ b/util-linux/volume_id/Kbuild.src
@@ -41,6 +41,7 @@ lib-$(CONFIG_FEATURE_VOLUMEID_XFS) += xfs.o
lib-$(CONFIG_FEATURE_VOLUMEID_CRAMFS) += cramfs.o
### lib-$(CONFIG_FEATURE_VOLUMEID_HPFS) += hpfs.o
lib-$(CONFIG_FEATURE_VOLUMEID_ROMFS) += romfs.o
+lib-$(CONFIG_FEATURE_VOLUMEID_SQUASHFS) += squashfs.o
lib-$(CONFIG_FEATURE_VOLUMEID_SYSV) += sysv.o
### lib-$(CONFIG_FEATURE_VOLUMEID_MINIX) += minix.o
lib-$(CONFIG_FEATURE_VOLUMEID_LUKS) += luks.o
diff --git a/util-linux/volume_id/squashfs.c b/util-linux/volume_id/squashfs.c
new file mode 100644
index 0000000..3d894c5
--- /dev/null
+++ b/util-linux/volume_id/squashfs.c
@@ -0,0 +1,41 @@
+/*
+ * volume_id - reads filesystem label and uuid
+ *
+ * Copyright (C) 2012 S-G Bergh <sgb@systemasis.org>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+
+#include "volume_id_internal.h"
+
+struct squashfs_superblock {
+ uint8_t magic[4];
+/*
+ uint32_t dummy[6];
+ uint16_t major;
+ uint16_t minor;
+*/
+} PACKED;
+
+int FAST_FUNC volume_id_probe_squashfs(struct volume_id *id /*,uint64_t off*/)
+{
+#define off ((uint64_t)0)
+ struct squashfs_superblock *sb;
+
+ dbg("SquashFS: probing at offset 0x%llx", (unsigned long long) off);
+ sb = volume_id_get_buffer(id, off, 0x200);
+ if (!sb)
+ return -1;
+
+ // Old SquashFS (pre 4.0) can be both big and little endian, so test for both.
+ // Likewise, it is commonly used in firwmare with some non-standard signatures.
+ if (memcmp(sb->magic, "hsqs", 4) == 0 ||
+ memcmp(sb->magic, "sqsh", 4) == 0 ||
+ memcmp(sb->magic, "qshs", 4) == 0 ||
+ memcmp(sb->magic, "shsq", 4) == 0) {
+ IF_FEATURE_BLKID_TYPE(id->type = "squashfs";)
+ return 0;
+ }
+
+ return -1;
+}
diff --git a/util-linux/volume_id/volume_id.c b/util-linux/volume_id/volume_id.c
index 3c3c698..f0fc84c 100644
--- a/util-linux/volume_id/volume_id.c
+++ b/util-linux/volume_id/volume_id.c
@@ -99,6 +99,9 @@ static const probe_fptr fs1[] = {
#if ENABLE_FEATURE_VOLUMEID_MAC
volume_id_probe_mac_partition_map,
#endif
+#if ENABLE_FEATURE_VOLUMEID_SQUASHFS
+ volume_id_probe_squashfs,
+#endif
#if ENABLE_FEATURE_VOLUMEID_XFS
volume_id_probe_xfs,
#endif
diff --git a/util-linux/volume_id/volume_id_internal.h b/util-linux/volume_id/volume_id_internal.h
index 03dc46f..ec04c85 100644
--- a/util-linux/volume_id/volume_id_internal.h
+++ b/util-linux/volume_id/volume_id_internal.h
@@ -224,6 +224,8 @@ int FAST_FUNC volume_id_probe_reiserfs(struct volume_id *id /*,uint64_t off*/);
int FAST_FUNC volume_id_probe_romfs(struct volume_id *id /*,uint64_t off*/);
+int FAST_FUNC volume_id_probe_squashfs(struct volume_id *id /*,uint64_t off*/);
+
int FAST_FUNC volume_id_probe_sysv(struct volume_id *id /*,uint64_t off*/);
int FAST_FUNC volume_id_probe_udf(struct volume_id *id /*,uint64_t off*/);
_______________________________________________
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic