diff --git a/common.yaml b/common.yaml index 280e0d4..6a3a69a 100644 --- a/common.yaml +++ b/common.yaml @@ -27,7 +27,6 @@ ostree-layers: - overlay/15rhcos-journald-backcompat - overlay/20platform-chrony - overlay/21dhcp-chrony - - overlay/25azure-udev-rules - overlay/30rhcos-nvme-compat-udev - overlay/30gcp-udev-rules - overlay/30lvmdevices diff --git a/manifest-el9-shared.yaml b/manifest-el9-shared.yaml index d0fef13..0ace9e5 100644 --- a/manifest-el9-shared.yaml +++ b/manifest-el9-shared.yaml @@ -6,13 +6,6 @@ packages: # Reverts https://gitlab.cee.redhat.com/coreos/redhat-coreos/merge_requests/367 and add it for all arches - glusterfs-fuse -# The azure-vm-utils package provides these udev rules, but it wont be added -# until EL10[1]. This can be dropped when moving to EL10, provided the -# package is included at that time. -# [1]:https://issues.redhat.com/browse/RHEL-73904 -ostree-layers: - - overlay/25rhcos-azure-udev - postprocess: # zram-generator-0.3.2 (shipped in centOS 9) provides a default zram-generator # config, we want to disable it. We don't need this in el10 because the config diff --git a/manifest-rhel-10.1.yaml b/manifest-rhel-10.1.yaml index 024bb70..52f0a12 100644 --- a/manifest-rhel-10.1.yaml +++ b/manifest-rhel-10.1.yaml @@ -29,4 +29,9 @@ mutate-os-release: "10.1" packages: # We include the generic release package and tweak the os-release info in a # post-process script + + # Azure VM utilities for udev rules and disk management + # It is available only in RHEL 10.1 as of now and it replaces custom overlay udev rules + # https://issues.redhat.com/browse/COS-2074 + - azure-vm-utils - redhat-release diff --git a/overlay.d/25azure-udev-rules b/overlay.d/25azure-udev-rules deleted file mode 120000 index fcd4be3..0000000 --- a/overlay.d/25azure-udev-rules +++ /dev/null @@ -1 +0,0 @@ -../fedora-coreos-config/overlay.d/25azure-udev-rules \ No newline at end of file