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.
57 lines
2.0 KiB
57 lines
2.0 KiB
2 years ago
|
From 9e03c4d6c1245af87569cb337c4fd82d873ea5c7 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
|
||
|
|
|
||
|
|
Related: #2138081
|
||
|
|
---
|
||
|
|
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 8aac42b49d..8c2017a0ce 100644
|
||
|
|
--- a/man/systemd.net-naming-scheme.xml
|
||
|
|
+++ b/man/systemd.net-naming-scheme.xml
|
||
|
|
@@ -448,6 +448,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 18748e5376..c5b8ddfcf9 100644
|
||
|
|
--- a/src/shared/netif-naming-scheme.c
|
||
|
|
+++ b/src/shared/netif-naming-scheme.c
|
||
|
|
@@ -25,6 +25,7 @@ static const NamingScheme naming_schemes[] = {
|
||
|
|
{ "v250", NAMING_V250 },
|
||
|
|
{ "v251", NAMING_V251 },
|
||
|
|
{ "v252", NAMING_V252 },
|
||
|
|
+ { "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 4fa9170969..b5fa1f0ef0 100644
|
||
|
|
--- a/src/shared/netif-naming-scheme.h
|
||
|
|
+++ b/src/shared/netif-naming-scheme.h
|
||
|
|
@@ -51,6 +51,7 @@ typedef enum NamingSchemeFlags {
|
||
|
|
NAMING_V250 = NAMING_V249 | NAMING_XEN_VIF,
|
||
|
|
NAMING_V251 = NAMING_V250 | NAMING_BRIDGE_MULTIFUNCTION_SLOT,
|
||
|
|
NAMING_V252 = NAMING_V251 | NAMING_DEVICETREE_ALIASES,
|
||
|
|
+ NAMING_RHEL_9_0 = NAMING_V250,
|
||
|
|
|
||
|
|
EXTRA_NET_NAMING_SCHEMES
|
||
|
|
|