rpms/util-linux
7
0
Fork 0
Code Issues Pull Requests Releases Activity

2.27.1-3: fix #1299255

Browse Source
This commit is contained in:
Karel Zak 2016-01-18 15:15:15 +01:00
parent c9e662019e
commit 9f10eae074
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libblkid-minix.patch Normal file
View File

@ -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) :

7
util-linux.spec
View File

@ -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 <kzak@redhat.com> - 2.27.1-4
- fix #1299255 - boot.iso (from 20160117 Rawhide compose) incorrectly detected as minix FS
* Wed Nov 18 2015 Karel Zak <kzak@redhat.com> - 2.27.1-3
- fix #1259745 - Can't start installation in Rawhide or F23 recent development images