From d50e806fd55aec24c8f7d84bf8f48135a9519db6 Mon Sep 17 00:00:00 2001 From: Marian Csontos Date: Tue, 17 Sep 2019 15:56:15 +0200 Subject: [PATCH] Fix invalid value warning in 11-dm-lvm.rules:40 event_timeout is invalid value and was deprecated long ago. --- ...supported-OPTIONS-event_timeout-rule.patch | 51 +++++++++++++++++++ lvm2.spec | 9 +++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 lvm2-2_03_06-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch diff --git a/lvm2-2_03_06-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch b/lvm2-2_03_06-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch new file mode 100644 index 0000000..34ef075 --- /dev/null +++ b/lvm2-2_03_06-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch @@ -0,0 +1,51 @@ +From 94405cd283e6b0f66256928d0a95e6782881dc9f Mon Sep 17 00:00:00 2001 +From: Peter Rajnoha +Date: Tue, 13 Aug 2019 15:18:30 +0200 +Subject: [PATCH] udev: remove unsupported OPTIONS+="event_timeout" rule + +The OPTIONS+="event_timeout" is Unsupported since systemd/udev version 216, +that is ~5 years ago. + +Since systemd/udev version 243, there's a new message printed if unsupported +OPTIONS value is used: + + Invalid value for OPTIONS key, ignoring: 'event_timeout=180' + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1740666 +(cherry picked from commit 125f27ac37bc9b93cc96f64052b9681b3d479ee1) + +Conflicts: + WHATS_NEW +--- + WHATS_NEW | 4 ++++ + udev/11-dm-lvm.rules.in | 2 -- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/WHATS_NEW b/WHATS_NEW +index 3a58de5..2e1aa13 100644 +--- a/WHATS_NEW ++++ b/WHATS_NEW +@@ -1,3 +1,7 @@ ++Version 2.03.06 - ++================================ ++ Remove unsupported OPTIONS+="event_timeout" udev rule from 11-dm-lvm.rules. ++ + Version 2.03.05 - 15th June 2019 + ================================ + Fix command definition for pvchange -a. +diff --git a/udev/11-dm-lvm.rules.in b/udev/11-dm-lvm.rules.in +index 91cb991..7c58994 100644 +--- a/udev/11-dm-lvm.rules.in ++++ b/udev/11-dm-lvm.rules.in +@@ -37,8 +37,6 @@ ENV{DM_SUBSYSTEM_UDEV_FLAG0}!="1", ENV{DM_NOSCAN}=="1", ENV{DM_UDEV_DISABLE_OTHE + + ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}=="1", GOTO="lvm_end" + +-OPTIONS+="event_timeout=180" +- + # Do not create symlinks for inappropriate subdevices. + ENV{DM_LV_NAME}=="pvmove?*|?*_vorigin", GOTO="lvm_disable" + ENV{DM_LV_LAYER}=="?*", GOTO="lvm_disable" +-- +1.8.3.1 + diff --git a/lvm2.spec b/lvm2.spec index bf4e4ef..204bfe1 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -57,7 +57,7 @@ Name: lvm2 Epoch: %{rhel} %endif Version: 2.03.05 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 URL: http://sourceware.org/lvm2 #Source0: ftp://sourceware.org/pub/lvm2/releases/LVM2.%%{version}.tgz @@ -66,7 +66,10 @@ Patch0: lvm2-set-default-preferred_names.patch Patch1: lvm2-2_03_06-md-component-detection-for-differing-PV-and-device-size.patch Patch2: lvm2-2_03_06-pvscan-fix-PV-online-when-device-has-a-different-size.patch Patch3: lvm2-2_03_06-lvconvert-allow-stripes-stripesize-in-mirror-conversions.patch +# Bug 1745597 - LVM DBus API doesn't work with Python 3.8: Patch4: lvm2-2_03_06-Fix-converting-dbus.UInt-types-to-string.patch +# Bug 1749857 - 11-dm-lvm.rules:40 Invalid value: +Patch5: lvm2-2_03_06-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch BuildRequires: gcc %if %{enable_testsuite} @@ -127,6 +130,7 @@ or more physical volumes and creating one or more logical volumes %patch2 -p1 -b .fix_PV_activation_diff_PV_and_dev_size %patch3 -p1 -b .allow_mirror_conversion_with_stripes %patch4 -p1 -b .fix_converting_dbus.UInt_types_to_string +%patch5 -p1 -b .udev_remove_unsupported_OPTIONS_event_timeout_rule %build %global _default_pid_dir /run @@ -732,6 +736,9 @@ An extensive functional testsuite for LVM2. %endif %changelog +* Wed Sep 18 2019 Marian Csontos - 2.03.05-4 +- Remove unsupported OPTIONS+="event_timeout" from udev rule (#1749857) + * Tue Aug 27 2019 Adam Williamson - 2.03.05-3 - Backport fix for converting dbus.UInt to string in Python 3.8 (#1745597)