richardphibel / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
cc3383
From 464a8fc4e0b218793105431cc71bf98b0dc97fb5 Mon Sep 17 00:00:00 2001
cc3383
From: Jacek Migacz <jmigacz@redhat.com>
cc3383
Date: Thu, 3 Feb 2022 23:46:09 +0100
cc3383
Subject: [PATCH] Net naming scheme for RHEL-9.0
cc3383
cc3383
RHEL-only
cc3383
cc3383
Resolves: #2052106
cc3383
---
cc3383
 man/systemd.net-naming-scheme.xml | 7 +++++++
cc3383
 src/shared/netif-naming-scheme.c  | 1 +
cc3383
 src/shared/netif-naming-scheme.h  | 1 +
cc3383
 3 files changed, 9 insertions(+)
cc3383
cc3383
diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml
cc3383
index 41408411fc..942ef572ff 100644
cc3383
--- a/man/systemd.net-naming-scheme.xml
cc3383
+++ b/man/systemd.net-naming-scheme.xml
cc3383
@@ -403,6 +403,13 @@
cc3383
           </listitem>
cc3383
         </varlistentry>
cc3383
 
cc3383
+        <varlistentry>
cc3383
+          <term><constant>rhel-9.0</constant></term>
cc3383
+
cc3383
+          <listitem><para>Same as naming scheme <constant>v250</constant>.</para>
cc3383
+          </listitem>
cc3383
+        </varlistentry>
cc3383
+
cc3383
       </variablelist>
cc3383
 
cc3383
     <para>Note that <constant>latest</constant> may be used to denote the latest scheme known (to this
cc3383
diff --git a/src/shared/netif-naming-scheme.c b/src/shared/netif-naming-scheme.c
cc3383
index 245466c4cb..44d011a9b7 100644
cc3383
--- a/src/shared/netif-naming-scheme.c
cc3383
+++ b/src/shared/netif-naming-scheme.c
cc3383
@@ -23,6 +23,7 @@ static const NamingScheme naming_schemes[] = {
cc3383
         { "v247", NAMING_V247 },
cc3383
         { "v249", NAMING_V249 },
cc3383
         { "v250", NAMING_V250 },
cc3383
+        { "rhel-9.0", NAMING_RHEL_9_0 },
cc3383
         /* … add more schemes here, as the logic to name devices is updated … */
cc3383
 
cc3383
         EXTRA_NET_NAMING_MAP
cc3383
diff --git a/src/shared/netif-naming-scheme.h b/src/shared/netif-naming-scheme.h
cc3383
index 16b304ce10..f765db6ef2 100644
cc3383
--- a/src/shared/netif-naming-scheme.h
cc3383
+++ b/src/shared/netif-naming-scheme.h
cc3383
@@ -47,6 +47,7 @@ typedef enum NamingSchemeFlags {
cc3383
         NAMING_V247 = NAMING_V245 | NAMING_BRIDGE_NO_SLOT,
cc3383
         NAMING_V249 = NAMING_V247 | NAMING_SLOT_FUNCTION_ID | NAMING_16BIT_INDEX | NAMING_REPLACE_STRICTLY,
cc3383
         NAMING_V250 = NAMING_V249 | NAMING_XEN_VIF,
cc3383
+        NAMING_RHEL_9_0 = NAMING_V250,
cc3383
 
cc3383
         EXTRA_NET_NAMING_SCHEMES
cc3383