From 5aa6b6af6591e7cdca815b4966dc5e7b2d802e64 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Thu, 22 Aug 2024 13:47:56 +0200
Subject: [PATCH] net-naming-scheme: disable NAMING_FIRMWARE_NODE_SUN

It seems that virtio devices always have "0" in
the firmware_node/sun. And because of that, udev will
always name the device ens0, which leads to collisions.
So let's disable it for now.

rhel-only: policy
Resolves: RHEL-55728
---
 man/systemd.net-naming-scheme.xml | 2 +-
 src/shared/netif-naming-scheme.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml
index 610a05485b..8be24e4243 100644
--- a/man/systemd.net-naming-scheme.xml
+++ b/man/systemd.net-naming-scheme.xml
@@ -528,7 +528,7 @@
         <varlistentry>
           <term><constant>rhel-10.0-beta</constant></term>
 
-          <listitem><para>PCI slot number is now read from <constant>firmware_node/sun</constant> sysfs file.</para>
+          <listitem><para>Same as naming scheme <constant>v255</constant>.</para>
 
           <xi:include href="version-info.xml" xpointer="rhel-10.0.beta"/>
           </listitem>
diff --git a/src/shared/netif-naming-scheme.h b/src/shared/netif-naming-scheme.h
index 2e2023ba5b..fb733ba768 100644
--- a/src/shared/netif-naming-scheme.h
+++ b/src/shared/netif-naming-scheme.h
@@ -83,7 +83,7 @@ typedef enum NamingSchemeFlags {
         NAMING_RHEL_9_4 = NAMING_RHEL_9_3,
         NAMING_RHEL_9_5 = (NAMING_RHEL_9_4 & ~NAMING_BRIDGE_MULTIFUNCTION_SLOT) | NAMING_FIRMWARE_NODE_SUN,
 
-        NAMING_RHEL_10_0_BETA = NAMING_V255 | NAMING_FIRMWARE_NODE_SUN,
+        NAMING_RHEL_10_0_BETA = NAMING_V255,
 
         EXTRA_NET_NAMING_SCHEMES