From 2429730ac1a2a6cbc026df36024b54c3b73b3f0e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 12 2015 13:22:40 +0000 Subject: import util-linux-2.23.2-22.el7_1 --- diff --git a/SOURCES/2.25-uuidd-timeout.patch b/SOURCES/2.25-uuidd-timeout.patch new file mode 100644 index 0000000..850c688 --- /dev/null +++ b/SOURCES/2.25-uuidd-timeout.patch @@ -0,0 +1,12 @@ +diff -up util-linux-2.23.2/misc-utils/uuidd.service.in.kzak util-linux-2.23.2/misc-utils/uuidd.service.in +--- util-linux-2.23.2/misc-utils/uuidd.service.in.kzak 2013-02-27 17:46:29.903020913 +0100 ++++ util-linux-2.23.2/misc-utils/uuidd.service.in 2015-04-20 11:31:44.614013049 +0200 +@@ -3,7 +3,7 @@ Description=Daemon for generating UUIDs + Requires=uuidd.socket + + [Service] +-ExecStart=@usrsbin_execdir@/uuidd --socket-activation --timeout 60 ++ExecStart=@usrsbin_execdir@/uuidd --socket-activation + Restart=no + User=uuidd + Group=uuidd diff --git a/SPECS/util-linux.spec b/SPECS/util-linux.spec index 9d3479d..141d236 100644 --- a/SPECS/util-linux.spec +++ b/SPECS/util-linux.spec @@ -2,7 +2,7 @@ Summary: A collection of basic system utilities Name: util-linux Version: 2.23.2 -Release: 21%{?dist} +Release: 22%{?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 @@ -166,6 +166,12 @@ Patch42: 2.26-blkdiscard.patch # 1181444 - raw command fails with "Cannot locate raw device". Patch43: 2.26-raw-stat.patch +# +# RHEL 7.2 +# +Patch44: 2.25-uuidd-timeout.patch + + %description The util-linux package contains a large variety of low-level system utilities that are necessary for a Linux system to function. Among @@ -882,6 +888,9 @@ fi %{_libdir}/pkgconfig/uuid.pc %changelog +* Mon Apr 20 2015 Karel Zak 2.23.2-22 +- fix #1092039 - uuidd not configured to run permanently + * Tue Jan 13 2015 Karel Zak 2.23.2-21 - fix #1181444 - raw command fails with "Cannot locate raw device"