b2570460aa
Resolves: RHEL-71409,RHEL-71086,RHEL-66198,RHEL-66196,RHEL-66195,RHEL-66193,RHEL-66192,RHEL-63995,RHEL-60896,RHEL-56064
62 lines
2.3 KiB
Diff
62 lines
2.3 KiB
Diff
From 5d21d8fba63d27a563137304324f5a52f527cbef Mon Sep 17 00:00:00 2001
|
|
From: Jan Macku <jamacku@redhat.com>
|
|
Date: Mon, 16 Dec 2024 15:08:50 +0100
|
|
Subject: [PATCH] netif-naming-scheme: introduce rhel-10.0 scheme
|
|
|
|
rhel-only: policy
|
|
|
|
Related: RHEL-44417
|
|
---
|
|
man/systemd.net-naming-scheme.xml | 11 ++++++++++-
|
|
src/shared/netif-naming-scheme.c | 1 +
|
|
src/shared/netif-naming-scheme.h | 1 +
|
|
3 files changed, 12 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml
|
|
index 18c1d95a74..e23d1c5758 100644
|
|
--- a/man/systemd.net-naming-scheme.xml
|
|
+++ b/man/systemd.net-naming-scheme.xml
|
|
@@ -549,8 +549,17 @@
|
|
<xi:include href="version-info.xml" xpointer="rhel-10.0.beta"/>
|
|
</listitem>
|
|
</varlistentry>
|
|
+
|
|
+ <varlistentry>
|
|
+ <term><constant>rhel-10.0</constant></term>
|
|
+
|
|
+ <listitem><para>Same as naming scheme <constant>v257</constant>.</para>
|
|
+
|
|
+ <xi:include href="version-info.xml" xpointer="rhel-10.0"/>
|
|
+ </listitem>
|
|
+ </varlistentry>
|
|
</variablelist>
|
|
- <para>By default <constant>rhel-10.0-beta</constant> is used.</para>
|
|
+ <para>By default <constant>rhel-10.0</constant> is used.</para>
|
|
|
|
<refsect2>
|
|
<title>RHEL-9 schemes</title>
|
|
diff --git a/src/shared/netif-naming-scheme.c b/src/shared/netif-naming-scheme.c
|
|
index 45646af6a6..42b0470a11 100644
|
|
--- a/src/shared/netif-naming-scheme.c
|
|
+++ b/src/shared/netif-naming-scheme.c
|
|
@@ -43,6 +43,7 @@ static const NamingScheme naming_schemes[] = {
|
|
{ "rhel-9.4", NAMING_RHEL_9_4 },
|
|
{ "rhel-9.5", NAMING_RHEL_9_5 },
|
|
{ "rhel-10.0-beta", NAMING_RHEL_10_0_BETA },
|
|
+ { "rhel-10.0", NAMING_RHEL_10_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 c4e18bb035..780392a583 100644
|
|
--- a/src/shared/netif-naming-scheme.h
|
|
+++ b/src/shared/netif-naming-scheme.h
|
|
@@ -86,6 +86,7 @@ typedef enum NamingSchemeFlags {
|
|
NAMING_RHEL_9_5 = NAMING_RHEL_9_4 & ~NAMING_BRIDGE_MULTIFUNCTION_SLOT,
|
|
|
|
NAMING_RHEL_10_0_BETA = NAMING_V255,
|
|
+ NAMING_RHEL_10_0 = NAMING_V257,
|
|
|
|
EXTRA_NET_NAMING_SCHEMES
|
|
|