This commit is contained in:
Karel Zak 2016-06-13 12:50:49 +02:00
parent 2afb30fac6
commit de66720388
2 changed files with 41 additions and 1 deletions

34
2.28-libblkid-cdrom.patch Normal file
View File

@ -0,0 +1,34 @@
From 55ad13c26fe5d0e606be5a83937f31b8cf576588 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Thu, 28 Apr 2016 13:54:01 +0200
Subject: [PATCH] libblkid: make I/O errors on CDROMs non-fatal
It seems too tricky to get a real size of the data track on hybrid
disks with audio+data. It seems overkill to analyze all header in
libblkid and on some disks it's probably possible to get I/O error
almost everywhere due to crazy copy protection etc.
Signed-off-by: Karel Zak <kzak@redhat.com>
---
libblkid/src/probe.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
index 63baed3..5d9f701 100644
--- a/libblkid/src/probe.c
+++ b/libblkid/src/probe.c
@@ -615,7 +615,10 @@ static struct blkid_bufinfo *read_buffer(blkid_probe pr, uint64_t real_off, uint
if (ret != (ssize_t) len) {
DBG(LOWPROBE, ul_debug("\tread failed: %m"));
free(bf);
- if (ret >= 0)
+
+ /* I/O errors on CDROMs are non-fatal to work with hybrid
+ * audio+data disks */
+ if (ret >= 0 || blkid_probe_is_cdrom(pr))
errno = 0;
return NULL;
}
--
2.4.11

View File

@ -2,7 +2,7 @@
Summary: A collection of basic system utilities Summary: A collection of basic system utilities
Name: util-linux Name: util-linux
Version: 2.28 Version: 2.28
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
Group: System Environment/Base Group: System Environment/Base
URL: http://en.wikipedia.org/wiki/Util-linux URL: http://en.wikipedia.org/wiki/Util-linux
@ -89,6 +89,9 @@ Requires: libfdisk = %{version}-%{release}
# 151635 - makeing /var/log/lastlog # 151635 - makeing /var/log/lastlog
Patch0: 2.28-login-lastlog-create.patch Patch0: 2.28-login-lastlog-create.patch
# upstream patch - #1234317 - CD / DVD are rarely automounted
Patch1: 2.28-libblkid-cdrom.patch
%description %description
The util-linux package contains a large variety of low-level system The util-linux package contains a large variety of low-level system
utilities that are necessary for a Linux system to function. Among utilities that are necessary for a Linux system to function. Among
@ -919,6 +922,9 @@ exit 0
%{_libdir}/python*/site-packages/libmount/* %{_libdir}/python*/site-packages/libmount/*
%changelog %changelog
* Mon Jun 13 2016 Karel Zak <kzak@redhat.com> - 2.28-3
- fix #1234317 - CD / DVD are rarely automounted
* Tue Apr 26 2016 Karel Zak <kzak@redhat.com> - 2.28-2 * Tue Apr 26 2016 Karel Zak <kzak@redhat.com> - 2.28-2
- refresh login-lastlog-create.patch - refresh login-lastlog-create.patch