da2bf9
From d45e0cc7a64648dc3ad082b512ff488537d3ebef Mon Sep 17 00:00:00 2001
da2bf9
From: Michal Sekletar <msekleta@redhat.com>
da2bf9
Date: Wed, 12 Jan 2022 15:35:19 +0100
da2bf9
Subject: [PATCH] udev/net_id: introduce naming scheme for RHEL-8.5
da2bf9
da2bf9
RHEL-only
da2bf9
da2bf9
Related: #2039797
da2bf9
---
da2bf9
 man/systemd.net-naming-scheme.xml | 6 ++++++
da2bf9
 src/udev/udev-builtin-net_id.c    | 2 ++
da2bf9
 2 files changed, 8 insertions(+)
da2bf9
da2bf9
diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml
da2bf9
index 10e71dcb15..be969bc8d0 100644
da2bf9
--- a/man/systemd.net-naming-scheme.xml
da2bf9
+++ b/man/systemd.net-naming-scheme.xml
da2bf9
@@ -301,6 +301,12 @@
da2bf9
           avoid possible naming conflict.</para></listitem>
da2bf9
         </varlistentry>
da2bf9
 
da2bf9
+        <varlistentry>
da2bf9
+          <term><constant>rhel-8.5</constant></term>
da2bf9
+
da2bf9
+          <para>Same as naming scheme <constant>rhel-8.4</constant>.</para>
da2bf9
+        </varlistentry>
da2bf9
+
da2bf9
         <para>Note that <constant>latest</constant> may be used to denote the latest scheme known (to this
da2bf9
         particular version of systemd.</para>
da2bf9
     </variablelist>
da2bf9
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
da2bf9
index 7c153f0aef..81139e666b 100644
da2bf9
--- a/src/udev/udev-builtin-net_id.c
da2bf9
+++ b/src/udev/udev-builtin-net_id.c
da2bf9
@@ -134,6 +134,7 @@ typedef enum NamingSchemeFlags {
da2bf9
         NAMING_RHEL_8_2 = NAMING_V239,
da2bf9
         NAMING_RHEL_8_3 = NAMING_V239,
da2bf9
         NAMING_RHEL_8_4 = NAMING_V239|NAMING_BRIDGE_NO_SLOT,
da2bf9
+        NAMING_RHEL_8_5 = NAMING_RHEL_8_4,
da2bf9
 
da2bf9
         _NAMING_SCHEME_FLAGS_INVALID = -1,
da2bf9
 } NamingSchemeFlags;
da2bf9
@@ -151,6 +152,7 @@ static const NamingScheme naming_schemes[] = {
da2bf9
         { "rhel-8.2", NAMING_RHEL_8_2 },
da2bf9
         { "rhel-8.3", NAMING_RHEL_8_3 },
da2bf9
         { "rhel-8.4", NAMING_RHEL_8_4 },
da2bf9
+        { "rhel-8.5", NAMING_RHEL_8_5 },
da2bf9
         /* … add more schemes here, as the logic to name devices is updated … */
da2bf9
 };
da2bf9