diff options
| author | Eric Sandeen <sandeen@fedoraproject.org> | 2007-10-02 18:31:28 +0000 |
|---|---|---|
| committer | Eric Sandeen <sandeen@fedoraproject.org> | 2007-10-02 18:31:28 +0000 |
| commit | b183c007e92e41794ac3e7bfbfe5afe5d6b3a701 (patch) | |
| tree | 4610d5038ca89a3f983ae93384d4cb41a107cb01 | |
| parent | 1c04cf09dc1985afcaf56d3a6b68183fb92c5c2a (diff) | |
| download | e2fsprogs-b183c007e92e41794ac3e7bfbfe5afe5d6b3a701.tar.gz e2fsprogs-b183c007e92e41794ac3e7bfbfe5afe5d6b3a701.tar.xz e2fsprogs-b183c007e92e41794ac3e7bfbfe5afe5d6b3a701.zip | |
* Tue Oct 02 2007 Eric Sandeen <esandeen@redhat.com> 1.40.2-8e2fsprogs-1_40_2-8_fc8
- Detect squashfs filesystems in libblkid (#305151)
| -rw-r--r-- | e2fsprogs-1.40.2-blkid-squashfs.patch | 24 | ||||
| -rw-r--r-- | e2fsprogs.spec | 8 |
2 files changed, 31 insertions, 1 deletions
diff --git a/e2fsprogs-1.40.2-blkid-squashfs.patch b/e2fsprogs-1.40.2-blkid-squashfs.patch new file mode 100644 index 0000000..dd7ceee --- /dev/null +++ b/e2fsprogs-1.40.2-blkid-squashfs.patch @@ -0,0 +1,24 @@ +Sent to linux-ext4 list on 25 Sep 2007. + +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 <sandeen@redhat.com> + +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 } + }; + + + diff --git a/e2fsprogs.spec b/e2fsprogs.spec index d0e2da6..601be88 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -4,7 +4,7 @@ Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems Name: e2fsprogs Version: 1.40.2 -Release: 7%{?dist} +Release: 8%{?dist} # License based on upstream-modified COPYING file, # which clearly states "V2" intent. License: GPLv2 @@ -23,6 +23,7 @@ Patch64: e2fsprogs-1.40.2-swapfs.patch Patch65: e2fsprogs-1.40.2-fix-open-create-modes.patch Patch66: e2fsprogs-1.40.2-protect-open-ops.patch Patch67: e2fsprogs-1.40.2-blkid-FAT-magic-not-on-strict-position.patch +Patch68: e2fsprogs-1.40.2-blkid-squashfs.patch Url: http://e2fsprogs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -103,6 +104,8 @@ also want to install e2fsprogs. %patch66 -p1 -b .open # fix fat probe when there is a real MBR %patch67 -p1 -b .blkid-fat +# detect squashfs in libblkid (#305151) +%patch68 -p1 -b .blkid-squashfs %build aclocal @@ -264,6 +267,9 @@ exit 0 %{_mandir}/man3/uuid_unparse.3* %changelog +* Tue Oct 02 2007 Eric Sandeen <esandeen@redhat.com> 1.40.2-8 +- Detect squashfs filesystems in libblkid (#305151) + * Tue Sep 18 2007 Eric Sandeen <esandeen@redhat.com> 1.40.2-7 - Fix blkid fat probe when there is a real MBR (#290951) |