diff --git a/2.27-blkid-zfs-raid.patch b/2.27-blkid-zfs-raid.patch new file mode 100644 index 0000000..14f6926 --- /dev/null +++ b/2.27-blkid-zfs-raid.patch @@ -0,0 +1,13 @@ +diff -up util-linux-2.27.1/libblkid/src/probe.c.kzak util-linux-2.27.1/libblkid/src/probe.c +diff -up util-linux-2.27.1/libblkid/src/superblocks/zfs.c.kzak util-linux-2.27.1/libblkid/src/superblocks/zfs.c +--- util-linux-2.27.1/libblkid/src/superblocks/zfs.c.kzak 2015-11-02 10:07:34.567648465 +0100 ++++ util-linux-2.27.1/libblkid/src/superblocks/zfs.c 2015-11-18 12:13:32.716188023 +0100 +@@ -258,7 +258,7 @@ static int probe_zfs(blkid_probe pr, con + const struct blkid_idinfo zfs_idinfo = + { + .name = "zfs_member", +- .usage = BLKID_USAGE_RAID, ++ .usage = BLKID_USAGE_FILESYSTEM, + .probefunc = probe_zfs, + .minsz = 64 * 1024 * 1024, + .magics = BLKID_NONE_MAGIC diff --git a/util-linux.spec b/util-linux.spec index fa3fe5b..46c997b 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: 2%{?dist} +Release: 3%{?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 @@ -88,6 +88,8 @@ Requires: libfdisk = %{version}-%{release} ### # 151635 - makeing /var/log/lastlog 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 %description The util-linux package contains a large variety of low-level system @@ -894,6 +896,9 @@ exit 0 %{_libdir}/python*/site-packages/libmount/* %changelog +* Wed Nov 18 2015 Karel Zak - 2.27.1-3 +- fix #1259745 - Can't start installation in Rawhide or F23 recent development images + * Tue Nov 10 2015 Fedora Release Engineering - 2.27.1-2 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5