59 lines
2.2 KiB
Diff
59 lines
2.2 KiB
Diff
From 4055f81a331d519e557bc1761811e9291a68bc9a Mon Sep 17 00:00:00 2001
|
|
From: Jan Macku <jamacku@redhat.com>
|
|
Date: Mon, 6 Jan 2025 09:09:11 +0100
|
|
Subject: [PATCH] udev/net_id: introduce naming scheme for RHEL-9.6
|
|
|
|
rhel-only: policy
|
|
|
|
Resolves: RHEL-44417
|
|
---
|
|
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 e23d1c5758..0b0bbbb2f1 100644
|
|
--- a/man/systemd.net-naming-scheme.xml
|
|
+++ b/man/systemd.net-naming-scheme.xml
|
|
@@ -632,6 +632,15 @@
|
|
<xi:include href="version-info.xml" xpointer="rhel-9.5"/>
|
|
</listitem>
|
|
</varlistentry>
|
|
+
|
|
+ <varlistentry>
|
|
+ <term><constant>rhel-9.6</constant></term>
|
|
+
|
|
+ <listitem><para>Same as naming scheme <constant>rhel-9.5</constant>.</para>
|
|
+
|
|
+ <xi:include href="version-info.xml" xpointer="rhel-9.6"/>
|
|
+ </listitem>
|
|
+ </varlistentry>
|
|
</variablelist>
|
|
</refsect2>
|
|
|
|
diff --git a/src/shared/netif-naming-scheme.c b/src/shared/netif-naming-scheme.c
|
|
index 42b0470a11..5211eebc22 100644
|
|
--- a/src/shared/netif-naming-scheme.c
|
|
+++ b/src/shared/netif-naming-scheme.c
|
|
@@ -42,6 +42,7 @@ static const NamingScheme naming_schemes[] = {
|
|
{ "rhel-9.3", NAMING_RHEL_9_3 },
|
|
{ "rhel-9.4", NAMING_RHEL_9_4 },
|
|
{ "rhel-9.5", NAMING_RHEL_9_5 },
|
|
+ { "rhel-9.6", NAMING_RHEL_9_6 },
|
|
{ "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 … */
|
|
diff --git a/src/shared/netif-naming-scheme.h b/src/shared/netif-naming-scheme.h
|
|
index 780392a583..a82f2f04d3 100644
|
|
--- a/src/shared/netif-naming-scheme.h
|
|
+++ b/src/shared/netif-naming-scheme.h
|
|
@@ -84,6 +84,7 @@ typedef enum NamingSchemeFlags {
|
|
NAMING_RHEL_9_3 = NAMING_RHEL_9_0 | NAMING_SR_IOV_R,
|
|
NAMING_RHEL_9_4 = NAMING_RHEL_9_3,
|
|
NAMING_RHEL_9_5 = NAMING_RHEL_9_4 & ~NAMING_BRIDGE_MULTIFUNCTION_SLOT,
|
|
+ NAMING_RHEL_9_6 = NAMING_RHEL_9_5,
|
|
|
|
NAMING_RHEL_10_0_BETA = NAMING_V255,
|
|
NAMING_RHEL_10_0 = NAMING_V257,
|