You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
56 lines
2.1 KiB
56 lines
2.1 KiB
2 years ago
|
From edbd954a140b097e3fc4c9246bda88a43692122b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jan Macku <jamacku@redhat.com>
|
||
|
|
Date: Thu, 16 Feb 2023 16:08:57 +0100
|
||
|
|
Subject: [PATCH] udev/net_id: introduce naming scheme for RHEL-9.2
|
||
|
|
|
||
|
|
RHEL-only
|
||
|
|
|
||
|
|
Resolves: #2170500
|
||
|
|
---
|
||
|
|
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 ca8ba7010e..0886369c9b 100644
|
||
|
|
--- a/man/systemd.net-naming-scheme.xml
|
||
|
|
+++ b/man/systemd.net-naming-scheme.xml
|
||
|
|
@@ -466,6 +466,12 @@
|
||
|
|
<listitem><para>Same as naming scheme <constant>rhel-9.0</constant>.</para></listitem>
|
||
|
|
</varlistentry>
|
||
|
|
|
||
|
|
+ <varlistentry>
|
||
|
|
+ <term><constant>rhel-9.2</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 a20b990f2e..d846c794a8 100644
|
||
|
|
--- a/src/shared/netif-naming-scheme.c
|
||
|
|
+++ b/src/shared/netif-naming-scheme.c
|
||
|
|
@@ -27,6 +27,7 @@ static const NamingScheme naming_schemes[] = {
|
||
|
|
{ "v252", NAMING_V252 },
|
||
|
|
{ "rhel-9.0", NAMING_RHEL_9_0 },
|
||
|
|
{ "rhel-9.1", NAMING_RHEL_9_1 },
|
||
|
|
+ { "rhel-9.2", NAMING_RHEL_9_2 },
|
||
|
|
/* … 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 d70c19ade3..3e35c5e2fa 100644
|
||
|
|
--- a/src/shared/netif-naming-scheme.h
|
||
|
|
+++ b/src/shared/netif-naming-scheme.h
|
||
|
|
@@ -53,6 +53,7 @@ typedef enum NamingSchemeFlags {
|
||
|
|
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,
|
||
|
|
+ NAMING_RHEL_9_2 = NAMING_RHEL_9_0,
|
||
|
|
|
||
|
|
EXTRA_NET_NAMING_SCHEMES
|
||
|
|
|