diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2019-10-11 06:00:14 +0000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-10-10 23:29:29 -0700 |
commit | 663493e98883ada2a13a6e873700ed0eda654bb3 (patch) | |
tree | 7d682f667cb0b32ce75a80b4ca2523ed8daea621 /meta-oe/recipes-support/lvm2 | |
parent | 7b5e19ba4db36db498be73a99315e0ac26c6511f (diff) | |
download | meta-openembedded-contrib-663493e98883ada2a13a6e873700ed0eda654bb3.tar.gz |
lvm2: 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
The fix works on lvm2, it is not necessary for libdevmapper
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/lvm2')
-rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2/0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch | 39 | ||||
-rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch new file mode 100644 index 0000000000..5a6db4b886 --- /dev/null +++ b/meta-oe/recipes-support/lvm2/lvm2/0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch @@ -0,0 +1,39 @@ +From e48f8328f9d35f23a24e5b27237e8ebf1dbfa269 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 10 Oct 2019 22:38:00 -0400 +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 + +Signed-off-by: Peter Rajnoha <prajnoha@redhat.com> + +Upstream-Status: Backport [https://github.com/lvmteam/lvm2/commit/125f27ac37bc9b93cc96f64052b9681b3d479ee1] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + udev/11-dm-lvm.rules.in | 2 -- + 1 file changed, 2 deletions(-) + +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" +-- +2.23.0 + diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb b/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb index 9907d4f922..875709cd90 100644 --- a/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb +++ b/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb @@ -5,6 +5,7 @@ SRCREV = "913c28917e62577a2ef67152b2e5159237503dda" SRC_URI += " \ file://0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch \ file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \ + file://0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch \ " DEPENDS += "autoconf-archive-native" |