From 78bd8ec9e0d0c715b6a2ca0b36e5540328218824 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 25 Aug 2020 12:07:39 +0200 Subject: [PATCH] sys-fs/lvm2: Add a patch dropping unsupported udev rule The `OPTIONS+="event_timeout=180"` rule is not supported by systemd, and with recent update, systemd complains quite visibly in journalctl about it. This is already fixed in lvm2 upstream, so this patch will not be necessary when we do the update. --- .../sys-fs/lvm2/files/lvm2-2.02.145-rules.patch | 12 ++++++++++++ .../sys-fs/lvm2/lvm2-2.02.145-r5.ebuild | 1 + 2 files changed, 13 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/files/lvm2-2.02.145-rules.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/files/lvm2-2.02.145-rules.patch b/sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/files/lvm2-2.02.145-rules.patch new file mode 100644 index 0000000000..8787c1d4d9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/files/lvm2-2.02.145-rules.patch @@ -0,0 +1,12 @@ +diff -ur LVM2.2.02.145/udev/11-dm-lvm.rules.in LVM2.2.02.145.new/udev/11-dm-lvm.rules.in +--- LVM2.2.02.145/udev/11-dm-lvm.rules.in 2016-03-04 19:03:30.000000000 +0100 ++++ LVM2.2.02.145.new/udev/11-dm-lvm.rules.in 2020-08-25 12:01:32.235684488 +0200 +@@ -37,8 +37,6 @@ + + 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" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.145-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.145-r5.ebuild index 59389b00c3..c2ec40dfcd 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.145-r5.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.145-r5.ebuild @@ -71,6 +71,7 @@ PATCHES=( # Flatcar: "${FILESDIR}"/${PN}-2.02.145-oneshot.patch # https://github.com/lvmteam/lvm2/pull/37 + "${FILESDIR}"/${PN}-2.02.145-rules.patch # https://sourceware.org/git/?p=lvm2.git;a=commit;h=125f27ac37bc9b93cc96f64052b9681b3d479ee1 ) pkg_setup() {