56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
|
From ef6d76202a28d374a96c4dff1e40c7bd4551de0c 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
|
||
|
|
|
||
|
|
Resolves: #2121144
|
||
|
|
---
|
||
|
|
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 73d08b681d..23bfcead1f 100644
|
||
|
|
--- a/man/systemd.net-naming-scheme.xml
|
||
|
|
+++ b/man/systemd.net-naming-scheme.xml
|
||
|
|
@@ -415,6 +415,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 44d011a9b7..adda731f63 100644
|
||
|
|
--- a/src/shared/netif-naming-scheme.c
|
||
|
|
+++ b/src/shared/netif-naming-scheme.c
|
||
|
|
@@ -24,6 +24,7 @@ static const NamingScheme naming_schemes[] = {
|
||
|
|
{ "v249", NAMING_V249 },
|
||
|
|
{ "v250", NAMING_V250 },
|
||
|
|
{ "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 5c86cb4545..f27c0593c3 100644
|
||
|
|
--- a/src/shared/netif-naming-scheme.h
|
||
|
|
+++ b/src/shared/netif-naming-scheme.h
|
||
|
|
@@ -49,6 +49,7 @@ typedef enum NamingSchemeFlags {
|
||
|
|
NAMING_V249 = NAMING_V247 | NAMING_SLOT_FUNCTION_ID | NAMING_16BIT_INDEX | NAMING_REPLACE_STRICTLY,
|
||
|
|
NAMING_V250 = NAMING_V249 | NAMING_XEN_VIF,
|
||
|
|
NAMING_RHEL_9_0 = NAMING_V250 | NAMING_BRIDGE_MULTIFUNCTION_SLOT,
|
||
|
|
+ NAMING_RHEL_9_1 = NAMING_RHEL_9_0,
|
||
|
|
|
||
|
|
EXTRA_NET_NAMING_SCHEMES
|
||
|
|
|