From 9f10eae074f834172f216585ed9ebd604e1ffbfa Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 18 Jan 2016 15:15:15 +0100 Subject: [PATCH] 2.27.1-3: fix #1299255 --- libblkid-minix.patch | 13 +++++++++++++ util-linux.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 libblkid-minix.patch diff --git a/libblkid-minix.patch b/libblkid-minix.patch new file mode 100644 index 0000000..c913938 --- /dev/null +++ b/libblkid-minix.patch @@ -0,0 +1,13 @@ +diff -up util-linux-2.27.1/libblkid/src/superblocks/minix.c.kzak util-linux-2.27.1/libblkid/src/superblocks/minix.c +--- util-linux-2.27.1/libblkid/src/superblocks/minix.c.kzak 2016-01-18 15:02:05.493738910 +0100 ++++ util-linux-2.27.1/libblkid/src/superblocks/minix.c 2016-01-18 15:04:20.020773281 +0100 +@@ -90,7 +90,8 @@ static int probe_minix(blkid_probe pr, c + struct minix_super_block *sb = (struct minix_super_block *) data; + int zones, ninodes, imaps, zmaps, firstz; + +- if (sb->s_imap_blocks == 0 || sb->s_zmap_blocks == 0) ++ if (sb->s_imap_blocks == 0 || sb->s_zmap_blocks == 0 || ++ sb->s_log_zone_size != 0) + return 1; + + zones = version == 2 ? minix_swab32(swabme, sb->s_zones) : diff --git a/util-linux.spec b/util-linux.spec index 46c997b..2efa016 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -2,7 +2,7 @@ Summary: A collection of basic system utilities Name: util-linux Version: 2.27.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain Group: System Environment/Base URL: http://en.wikipedia.org/wiki/Util-linux @@ -90,6 +90,8 @@ Requires: libfdisk = %{version}-%{release} Patch0: 2.23-login-lastlog-create.patch # 1259745 - Can't start installation in Rawhide or F23 recent development images Patch1: 2.27-blkid-zfs-raid.patch +# 1299255 - boot.iso (from 20160117 Rawhide compose) incorrectly detected as minix FS +Patch2: libblkid-minix.patch %description The util-linux package contains a large variety of low-level system @@ -896,6 +898,9 @@ exit 0 %{_libdir}/python*/site-packages/libmount/* %changelog +* Mon Jan 18 2016 Karel Zak - 2.27.1-4 +- fix #1299255 - boot.iso (from 20160117 Rawhide compose) incorrectly detected as minix FS + * Wed Nov 18 2015 Karel Zak - 2.27.1-3 - fix #1259745 - Can't start installation in Rawhide or F23 recent development images