57 lines
2.0 KiB
Diff
57 lines
2.0 KiB
Diff
|
From 464a8fc4e0b218793105431cc71bf98b0dc97fb5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jacek Migacz <jmigacz@redhat.com>
|
||
|
|
Date: Thu, 3 Feb 2022 23:46:09 +0100
|
||
|
|
Subject: [PATCH] Net naming scheme for RHEL-9.0
|
||
|
|
|
||
|
|
RHEL-only
|
||
|
|
|
||
|
|
Resolves: #2052106
|
||
|
|
---
|
||
|
|
man/systemd.net-naming-scheme.xml | 7 +++++++
|
||
|
|
src/shared/netif-naming-scheme.c | 1 +
|
||
|
|
src/shared/netif-naming-scheme.h | 1 +
|
||
|
|
3 files changed, 9 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml
|
||
|
|
index 41408411fc..942ef572ff 100644
|
||
|
|
--- a/man/systemd.net-naming-scheme.xml
|
||
|
|
+++ b/man/systemd.net-naming-scheme.xml
|
||
|
|
@@ -403,6 +403,13 @@
|
||
|
|
</listitem>
|
||
|
|
</varlistentry>
|
||
|
|
|
||
|
|
+ <varlistentry>
|
||
|
|
+ <term><constant>rhel-9.0</constant></term>
|
||
|
|
+
|
||
|
|
+ <listitem><para>Same as naming scheme <constant>v250</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 245466c4cb..44d011a9b7 100644
|
||
|
|
--- a/src/shared/netif-naming-scheme.c
|
||
|
|
+++ b/src/shared/netif-naming-scheme.c
|
||
|
|
@@ -23,6 +23,7 @@ static const NamingScheme naming_schemes[] = {
|
||
|
|
{ "v247", NAMING_V247 },
|
||
|
|
{ "v249", NAMING_V249 },
|
||
|
|
{ "v250", NAMING_V250 },
|
||
|
|
+ { "rhel-9.0", NAMING_RHEL_9_0 },
|
||
|
|
/* … 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 16b304ce10..f765db6ef2 100644
|
||
|
|
--- a/src/shared/netif-naming-scheme.h
|
||
|
|
+++ b/src/shared/netif-naming-scheme.h
|
||
|
|
@@ -47,6 +47,7 @@ typedef enum NamingSchemeFlags {
|
||
|
|
NAMING_V247 = NAMING_V245 | NAMING_BRIDGE_NO_SLOT,
|
||
|
|
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,
|
||
|
|
|
||
|
|
EXTRA_NET_NAMING_SCHEMES
|
||
|
|
|