ryantimwilson / rpms / systemd

Forked from rpms/systemd a month ago
Clone
Blob Blame History Raw
From 35ff2c23e2b95d7f1264259de17028d1b7472b87 Mon Sep 17 00:00:00 2001
From: Michal Sekletar <msekleta@redhat.com>
Date: Wed, 24 Aug 2022 17:18:47 +0200
Subject: [PATCH] udev/net_id: add "rhel-9.1" naming scheme

RHEL-only

Related: #2138081
---
 man/systemd.net-naming-scheme.xml | 6 ++++++
 src/shared/netif-naming-scheme.c  | 1 +
 src/shared/netif-naming-scheme.h  | 1 +
 3 files changed, 8 insertions(+)

diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml
index e5268be38e..ca8ba7010e 100644
--- a/man/systemd.net-naming-scheme.xml
+++ b/man/systemd.net-naming-scheme.xml
@@ -460,6 +460,12 @@
           </listitem>
         </varlistentry>
 
+        <varlistentry>
+           <term><constant>rhel-9.1</constant></term>
+
+           <listitem><para>Same as naming scheme <constant>rhel-9.0</constant>.</para></listitem>
+        </varlistentry>
+
       </variablelist>
 
     <para>Note that <constant>latest</constant> may be used to denote the latest scheme known (to this
diff --git a/src/shared/netif-naming-scheme.c b/src/shared/netif-naming-scheme.c
index c5b8ddfcf9..a20b990f2e 100644
--- a/src/shared/netif-naming-scheme.c
+++ b/src/shared/netif-naming-scheme.c
@@ -26,6 +26,7 @@ static const NamingScheme naming_schemes[] = {
         { "v251", NAMING_V251 },
         { "v252", NAMING_V252 },
         { "rhel-9.0", NAMING_RHEL_9_0 },
+        { "rhel-9.1", NAMING_RHEL_9_1 },
         /* … add more schemes here, as the logic to name devices is updated … */
 
         EXTRA_NET_NAMING_MAP
diff --git a/src/shared/netif-naming-scheme.h b/src/shared/netif-naming-scheme.h
index fd3ae1b7f5..d70c19ade3 100644
--- a/src/shared/netif-naming-scheme.h
+++ b/src/shared/netif-naming-scheme.h
@@ -52,6 +52,7 @@ typedef enum NamingSchemeFlags {
         NAMING_V251 = NAMING_V250 | NAMING_BRIDGE_MULTIFUNCTION_SLOT,
         NAMING_V252 = NAMING_V251 | NAMING_DEVICETREE_ALIASES,
         NAMING_RHEL_9_0 = NAMING_V250 | NAMING_BRIDGE_MULTIFUNCTION_SLOT,
+        NAMING_RHEL_9_1 = NAMING_RHEL_9_0,
 
         EXTRA_NET_NAMING_SCHEMES