dcavalca / rpms / systemd

Forked from rpms/systemd 3 months ago
Clone
594167
From ef6d76202a28d374a96c4dff1e40c7bd4551de0c Mon Sep 17 00:00:00 2001
594167
From: Michal Sekletar <msekleta@redhat.com>
594167
Date: Wed, 24 Aug 2022 17:18:47 +0200
594167
Subject: [PATCH] udev/net_id: add "rhel-9.1" naming scheme
594167
594167
RHEL-only
594167
594167
Resolves: #2121144
594167
---
594167
 man/systemd.net-naming-scheme.xml | 6 ++++++
594167
 src/shared/netif-naming-scheme.c  | 1 +
594167
 src/shared/netif-naming-scheme.h  | 1 +
594167
 3 files changed, 8 insertions(+)
594167
594167
diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml
594167
index 73d08b681d..23bfcead1f 100644
594167
--- a/man/systemd.net-naming-scheme.xml
594167
+++ b/man/systemd.net-naming-scheme.xml
594167
@@ -415,6 +415,12 @@
594167
           </listitem>
594167
         </varlistentry>
594167
 
594167
+        <varlistentry>
594167
+           <term><constant>rhel-9.1</constant></term>
594167
+
594167
+           <listitem><para>Same as naming scheme <constant>rhel-9.0</constant>.</para></listitem>
594167
+        </varlistentry>
594167
+
594167
       </variablelist>
594167
 
594167
     <para>Note that <constant>latest</constant> may be used to denote the latest scheme known (to this
594167
diff --git a/src/shared/netif-naming-scheme.c b/src/shared/netif-naming-scheme.c
594167
index 44d011a9b7..adda731f63 100644
594167
--- a/src/shared/netif-naming-scheme.c
594167
+++ b/src/shared/netif-naming-scheme.c
594167
@@ -24,6 +24,7 @@ static const NamingScheme naming_schemes[] = {
594167
         { "v249", NAMING_V249 },
594167
         { "v250", NAMING_V250 },
594167
         { "rhel-9.0", NAMING_RHEL_9_0 },
594167
+        { "rhel-9.1", NAMING_RHEL_9_1 },
594167
         /* … add more schemes here, as the logic to name devices is updated … */
594167
 
594167
         EXTRA_NET_NAMING_MAP
594167
diff --git a/src/shared/netif-naming-scheme.h b/src/shared/netif-naming-scheme.h
594167
index 5c86cb4545..f27c0593c3 100644
594167
--- a/src/shared/netif-naming-scheme.h
594167
+++ b/src/shared/netif-naming-scheme.h
594167
@@ -49,6 +49,7 @@ typedef enum NamingSchemeFlags {
594167
         NAMING_V249 = NAMING_V247 | NAMING_SLOT_FUNCTION_ID | NAMING_16BIT_INDEX | NAMING_REPLACE_STRICTLY,
594167
         NAMING_V250 = NAMING_V249 | NAMING_XEN_VIF,
594167
         NAMING_RHEL_9_0 = NAMING_V250 | NAMING_BRIDGE_MULTIFUNCTION_SLOT,
594167
+        NAMING_RHEL_9_1 = NAMING_RHEL_9_0,
594167
 
594167
         EXTRA_NET_NAMING_SCHEMES
594167