From 0f3aaae1c54edb0d7d4f3e690b93b34c6042a5a1 Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Sun, 1 Mar 2026 23:58:55 +0100 Subject: [PATCH 1/3] [dnsmasq] /var/run is a symlink to /run (EL 9 and 10) In RHEL 10, changing the permissions does not work for /var/run/cifmw-dnsmasq.pid. The operation fails with; > File spec /var/run/cifmw-dnsmasq.pid conflicts with equivalency rule '/var/run /run'; Try adding '/run/cifmw-dnsmasq.pid' instead But /var/run is a symlink to /run also on RHEL 9, so using /run alone works on both releases. Signed-off-by: Luigi Toscano --- roles/dnsmasq/tasks/configure.yml | 2 +- roles/dnsmasq/templates/cifmw-dnsmasq.conf.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/dnsmasq/tasks/configure.yml b/roles/dnsmasq/tasks/configure.yml index aae7406e65..5bb90c5692 100644 --- a/roles/dnsmasq/tasks/configure.yml +++ b/roles/dnsmasq/tasks/configure.yml @@ -31,7 +31,7 @@ setype: "dnsmasq_etc_t" - target: "{{ cifmw_dnsmasq_basedir }}(/.*)?" setype: "dnsmasq_etc_t" - - target: "/var/run/cifmw-dnsmasq.pid" + - target: "/run/cifmw-dnsmasq.pid" setype: "dnsmasq_var_run_t" - name: Manage configuration directory diff --git a/roles/dnsmasq/templates/cifmw-dnsmasq.conf.j2 b/roles/dnsmasq/templates/cifmw-dnsmasq.conf.j2 index 2054bf4382..18cac38fab 100644 --- a/roles/dnsmasq/templates/cifmw-dnsmasq.conf.j2 +++ b/roles/dnsmasq/templates/cifmw-dnsmasq.conf.j2 @@ -1,7 +1,7 @@ # Managed by ci-framework/dnsmasq user=dnsmasq group=dnsmasq -pid-file=/var/run/cifmw-dnsmasq.pid +pid-file=/run/cifmw-dnsmasq.pid dhcp-leasefile=/var/lib/dnsmasq/cifmw-dnsmasq.leases {% if cifmw_dnsmasq_raw_config | length > 0 -%} From 4de42e5970f9b6702042d84b164e82f7f76e7cdd Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Mon, 2 Mar 2026 10:46:26 +0100 Subject: [PATCH 2/3] [config_drive] Use xorrisofs instead of genisoimage On RHEL 9, the xorriso package provides genisoimage, but it uses xorrisofs under the hood. On RHEL 10 the provide is removed, so just explicitly use xorrisofs from the xorriso package on both releases. Signed-off-by: Luigi Toscano --- roles/config_drive/tasks/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/config_drive/tasks/main.yml b/roles/config_drive/tasks/main.yml index e41c89ba16..6999fb70c0 100644 --- a/roles/config_drive/tasks/main.yml +++ b/roles/config_drive/tasks/main.yml @@ -23,13 +23,14 @@ - artifacts - logs +# xorriso provides genisoimage since RHEL 9 - name: Install required RPM packages tags: - packages become: true ansible.builtin.package: name: - - genisoimage + - xorriso - gzip - coreutils state: present @@ -97,7 +98,7 @@ output_dir: "{{ cifmw_config_drive_basedir }}/artifacts" creates: "{{ cifmw_config_drive_iso_image }}" script: >- - genisoimage -output {{ cifmw_config_drive_iso_image }} -volid CIDATA + xorrisofs -output {{ cifmw_config_drive_iso_image }} -volid CIDATA -joliet -rock user-data meta-data {% if cifmw_config_drive_networkconfig is defined and From b5eac7f532726c1b9efd2252c4ec2922e5af87f7 Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Mon, 2 Mar 2026 16:07:14 +0100 Subject: [PATCH 3/3] [devscript] NetworkManager-initscripts-updown is not needed The usage of the old network scripts (ifup/ifdown) was removed and replaced by nmcli two years ago by https://github.com/openshift-metal3/dev-scripts/pull/1631 Signed-off-by: Luigi Toscano --- roles/devscripts/vars/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/devscripts/vars/main.yml b/roles/devscripts/vars/main.yml index 1dbfc6b557..301c660264 100644 --- a/roles/devscripts/vars/main.yml +++ b/roles/devscripts/vars/main.yml @@ -23,7 +23,6 @@ cifmw_devscripts_packages: - ipmitool - - NetworkManager-initscripts-updown - patch - python3-jmespath - buildah