diff --git a/.packit.yaml b/.packit.yaml index 70dc53b..2fa88a7 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -5,16 +5,19 @@ jobs: trigger: release dist_git_branches: - fedora-all + - epel-9 - job: pull_from_upstream trigger: release dist_git_branches: - fedora-all + - epel-9 - job: koji_build trigger: commit dist_git_branches: - fedora-all + - epel-9 allowed_pr_authors: - packit - mhayden @@ -26,3 +29,4 @@ jobs: trigger: commit dist_git_branches: - fedora-branched + - epel-9 diff --git a/amazon-ec2-utils.spec b/amazon-ec2-utils.spec index 0856070..1b839ce 100644 --- a/amazon-ec2-utils.spec +++ b/amazon-ec2-utils.spec @@ -6,6 +6,10 @@ License: MIT AND CC-BY-SA-4.0 URL: https://github.com/amazonlinux/%{name}/ Source0: %{url}/archive/refs/tags/v%{version}.tar.gz +# Skip the EBS udev rules as they create invalid symlinks. +# See RHBZ#2284397 for more details. +Patch0: remove-EBS-udev-rules.patch + BuildArch: noarch Requires: curl diff --git a/remove-EBS-udev-rules.patch b/remove-EBS-udev-rules.patch new file mode 100644 index 0000000..43175a2 --- /dev/null +++ b/remove-EBS-udev-rules.patch @@ -0,0 +1,32 @@ +From 87d578a723f270b4a2bba120f3a143bc7c8b1b19 Mon Sep 17 00:00:00 2001 +From: Major Hayden +Date: Mon, 23 Sep 2024 10:47:15 -0500 +Subject: [PATCH] Remove EBS udev rules + +These rules create invalid symlinks. + +See RHBZ 2284397. + +Signed-off-by: Major Hayden +--- + 70-ec2-nvme-devices.rules | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/70-ec2-nvme-devices.rules b/70-ec2-nvme-devices.rules +index 6fae458..8f415a7 100644 +--- a/70-ec2-nvme-devices.rules ++++ b/70-ec2-nvme-devices.rules +@@ -13,10 +13,6 @@ KERNEL=="nvme[0-9]*n[0-9]*", ENV{DEVTYPE}=="disk", ATTRS{serial}=="?*", ATTRS{mo + KERNEL=="nvme[0-9]*n[0-9]*p[0-9]*", ENV{DEVTYPE}=="partition", ATTRS{serial}=="?*", ATTRS{model}=="?*", IMPORT{program}="/usr/sbin/ec2nvme-nsid %k" + KERNEL=="nvme[0-9]*n[0-9]*p[0-9]*", ENV{DEVTYPE}=="partition", ATTRS{serial}=="?*", ATTRS{model}=="?*", ENV{_NS_ID}=="?*", SYMLINK+="disk/by-id/nvme-$attr{model}_$attr{serial}-ns-$env{_NS_ID}-part%n", OPTIONS+="string_escape=replace" + +-# ebs nvme devices +-KERNEL=="nvme[0-9]*n[0-9]*", ENV{DEVTYPE}=="disk", ATTRS{model}=="Amazon Elastic Block Store", PROGRAM="/usr/sbin/ebsnvme-id -u /dev/%k", SYMLINK+="%c" +-KERNEL=="nvme[0-9]*n[0-9]*p[0-9]*", ENV{DEVTYPE}=="partition", ATTRS{model}=="Amazon Elastic Block Store", PROGRAM="/usr/sbin/ebsnvme-id -u /dev/%k", SYMLINK+="%c%n" +- + # Do not timeout I/O operations on EBS volumes. + KERNEL=="nvme[0-9]*n[0-9]*", ENV{DEVTYPE}=="disk", ATTRS{model}=="Amazon Elastic Block Store", ATTR{queue/io_timeout}="4294967295" + +-- +2.46.1 +