2007-09-25 17:02:51

by Eric Sandeen

Subject: [PATCH e2fsprogs] libblkid: detect squashfs

libblkid: recognize squashfs filesystems

squashfs has no uuid or labels, so all we need is the magic.

Addresses-Red-Hat-Bugzilla: #305151

Signed-off-by: Eric Sandeen <[email protected]>

Index: e2fsprogs-1.40.2/lib/blkid/probe.c
===================================================================
--- e2fsprogs-1.40.2.orig/lib/blkid/probe.c
+++ e2fsprogs-1.40.2/lib/blkid/probe.c
@@ -898,6 +898,7 @@ static struct blkid_magic type_array[] =
{ "ocfs2", 4, 0, 6, "OCFSV2", probe_ocfs2 },
{ "ocfs2", 8, 0, 6, "OCFSV2", probe_ocfs2 },
{ "crypt_LUKS", 0, 0, 6, "LUKS\xba\xbe", probe_luks },
+ { "squashfs", 0, 0, 4, "hsqs", 0 },
{ NULL, 0, 0, 0, NULL, NULL }
};

2007-10-14 20:30:36

by Theodore Ts'o

Subject: Re: [PATCH e2fsprogs] libblkid: detect squashfs

On Tue, Sep 25, 2007 at 12:02:50PM -0500, Eric Sandeen wrote:
> libblkid: recognize squashfs filesystems
>
> squashfs has no uuid or labels, so all we need is the magic.
>
> Addresses-Red-Hat-Bugzilla: #305151
>
> Signed-off-by: Eric Sandeen <[email protected]>

Thanks, applied to the maint branch.

- Ted

2007-10-15 17:49:46

by Eric Sandeen

Subject: Re: [PATCH e2fsprogs] libblkid: detect squashfs

Theodore Tso wrote:

> On Tue, Sep 25, 2007 at 12:02:50PM -0500, Eric Sandeen wrote:
>
>> libblkid: recognize squashfs filesystems
>>
>> squashfs has no uuid or labels, so all we need is the magic.
>>
>> Addresses-Red-Hat-Bugzilla: #305151
>>
>> Signed-off-by: Eric Sandeen <[email protected]>
>>
>
> Thanks, applied to the maint branch.
>
> - Ted
>
Thanks... and now for the big endian version. :( Sorry about that!

===================

libblkid: recognize squashfs filesystems on BE systems.

squashfs has no uuid or labels, so all we need is the magic
(for big-endian too!)

Addresses-Red-Hat-Bugzilla: #305151

Signed-off-by: Eric Sandeen <[email protected]>

Index: e2fsprogs-1.40.2/lib/blkid/probe.c
===================================================================
--- e2fsprogs-1.40.2.orig/lib/blkid/probe.c
+++ e2fsprogs-1.40.2/lib/blkid/probe.c
@@ -898,6 +898,7 @@ static struct blkid_magic type_array[] =
{ "ocfs2", 4, 0, 6, "OCFSV2", probe_ocfs2 },
{ "ocfs2", 8, 0, 6, "OCFSV2", probe_ocfs2 },
{ "crypt_LUKS", 0, 0, 6, "LUKS\xba\xbe", probe_luks },
+ { "squashfs", 0, 0, 4, "sqsh", 0 },
{ "squashfs", 0, 0, 4, "hsqs", 0 },
{ NULL, 0, 0, 0, NULL, NULL }
};

2007-10-15 21:01:41

by Theodore Ts'o

Subject: Re: [PATCH e2fsprogs] libblkid: detect squashfs

On Mon, Oct 15, 2007 at 12:48:44PM -0500, Eric Sandeen wrote:
> Thanks... and now for the big endian version. :( Sorry about that!

Thanks, applied into the maint branch.

- Ted