ee560ada81
Resolves: RHEL-100553,RHEL-103354,RHEL-104555,RHEL-106260,RHEL-44419,RHEL-72701,RHEL-79976,RHEL-97625,RHEL-97762
59 lines
2.1 KiB
Diff
59 lines
2.1 KiB
Diff
From 9190cba3b74c6cd9354e3a177baef2f46e923b9f Mon Sep 17 00:00:00 2001
|
|
From: Jan Macku <jamacku@redhat.com>
|
|
Date: Thu, 12 Jun 2025 13:59:11 +0200
|
|
Subject: [PATCH] udev/net_id: introduce naming scheme for RHEL-10.1
|
|
|
|
rhel-only: policy
|
|
|
|
Resolves: RHEL-44419
|
|
---
|
|
man/systemd.net-naming-scheme.xml | 9 +++++++++
|
|
src/shared/netif-naming-scheme.c | 1 +
|
|
src/shared/netif-naming-scheme.h | 1 +
|
|
3 files changed, 11 insertions(+)
|
|
|
|
diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml
|
|
index d2dc5fe7bb..7cf9b159e4 100644
|
|
--- a/man/systemd.net-naming-scheme.xml
|
|
+++ b/man/systemd.net-naming-scheme.xml
|
|
@@ -558,6 +558,15 @@
|
|
<xi:include href="version-info.xml" xpointer="rhel-10.0"/>
|
|
</listitem>
|
|
</varlistentry>
|
|
+
|
|
+ <varlistentry>
|
|
+ <term><constant>rhel-10.1</constant></term>
|
|
+
|
|
+ <listitem><para>Same as naming scheme <constant>rhel-10.0</constant>.</para>
|
|
+
|
|
+ <xi:include href="version-info.xml" xpointer="rhel-10.1"/>
|
|
+ </listitem>
|
|
+ </varlistentry>
|
|
</variablelist>
|
|
<para>By default <constant>rhel-10.0</constant> is used.</para>
|
|
|
|
diff --git a/src/shared/netif-naming-scheme.c b/src/shared/netif-naming-scheme.c
|
|
index 5211eebc22..de951c38db 100644
|
|
--- a/src/shared/netif-naming-scheme.c
|
|
+++ b/src/shared/netif-naming-scheme.c
|
|
@@ -45,6 +45,7 @@ static const NamingScheme naming_schemes[] = {
|
|
{ "rhel-9.6", NAMING_RHEL_9_6 },
|
|
{ "rhel-10.0-beta", NAMING_RHEL_10_0_BETA },
|
|
{ "rhel-10.0", NAMING_RHEL_10_0 },
|
|
+ { "rhel-10.1", NAMING_RHEL_10_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 a82f2f04d3..8ef92d2333 100644
|
|
--- a/src/shared/netif-naming-scheme.h
|
|
+++ b/src/shared/netif-naming-scheme.h
|
|
@@ -88,6 +88,7 @@ typedef enum NamingSchemeFlags {
|
|
|
|
NAMING_RHEL_10_0_BETA = NAMING_V255,
|
|
NAMING_RHEL_10_0 = NAMING_V257,
|
|
+ NAMING_RHEL_10_1 = NAMING_RHEL_10_0,
|
|
|
|
EXTRA_NET_NAMING_SCHEMES
|
|
|