dryang / rpms / systemd

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