dryang / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
ac3a84
From 35ff2c23e2b95d7f1264259de17028d1b7472b87 Mon Sep 17 00:00:00 2001
ac3a84
From: Michal Sekletar <msekleta@redhat.com>
ac3a84
Date: Wed, 24 Aug 2022 17:18:47 +0200
ac3a84
Subject: [PATCH] udev/net_id: add "rhel-9.1" naming scheme
ac3a84
ac3a84
RHEL-only
ac3a84
ac3a84
Related: #2138081
ac3a84
---
ac3a84
 man/systemd.net-naming-scheme.xml | 6 ++++++
ac3a84
 src/shared/netif-naming-scheme.c  | 1 +
ac3a84
 src/shared/netif-naming-scheme.h  | 1 +
ac3a84
 3 files changed, 8 insertions(+)
ac3a84
ac3a84
diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml
ac3a84
index e5268be38e..ca8ba7010e 100644
ac3a84
--- a/man/systemd.net-naming-scheme.xml
ac3a84
+++ b/man/systemd.net-naming-scheme.xml
ac3a84
@@ -460,6 +460,12 @@
ac3a84
           </listitem>
ac3a84
         </varlistentry>
ac3a84
 
ac3a84
+        <varlistentry>
ac3a84
+           <term><constant>rhel-9.1</constant></term>
ac3a84
+
ac3a84
+           <listitem><para>Same as naming scheme <constant>rhel-9.0</constant>.</para></listitem>
ac3a84
+        </varlistentry>
ac3a84
+
ac3a84
       </variablelist>
ac3a84
 
ac3a84
     <para>Note that <constant>latest</constant> may be used to denote the latest scheme known (to this
ac3a84
diff --git a/src/shared/netif-naming-scheme.c b/src/shared/netif-naming-scheme.c
ac3a84
index c5b8ddfcf9..a20b990f2e 100644
ac3a84
--- a/src/shared/netif-naming-scheme.c
ac3a84
+++ b/src/shared/netif-naming-scheme.c
ac3a84
@@ -26,6 +26,7 @@ static const NamingScheme naming_schemes[] = {
ac3a84
         { "v251", NAMING_V251 },
ac3a84
         { "v252", NAMING_V252 },
ac3a84
         { "rhel-9.0", NAMING_RHEL_9_0 },
ac3a84
+        { "rhel-9.1", NAMING_RHEL_9_1 },
ac3a84
         /* … add more schemes here, as the logic to name devices is updated … */
ac3a84
 
ac3a84
         EXTRA_NET_NAMING_MAP
ac3a84
diff --git a/src/shared/netif-naming-scheme.h b/src/shared/netif-naming-scheme.h
ac3a84
index fd3ae1b7f5..d70c19ade3 100644
ac3a84
--- a/src/shared/netif-naming-scheme.h
ac3a84
+++ b/src/shared/netif-naming-scheme.h
ac3a84
@@ -52,6 +52,7 @@ typedef enum NamingSchemeFlags {
ac3a84
         NAMING_V251 = NAMING_V250 | NAMING_BRIDGE_MULTIFUNCTION_SLOT,
ac3a84
         NAMING_V252 = NAMING_V251 | NAMING_DEVICETREE_ALIASES,
ac3a84
         NAMING_RHEL_9_0 = NAMING_V250 | NAMING_BRIDGE_MULTIFUNCTION_SLOT,
ac3a84
+        NAMING_RHEL_9_1 = NAMING_RHEL_9_0,
ac3a84
 
ac3a84
         EXTRA_NET_NAMING_SCHEMES
ac3a84