56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
From c51c192f303b3a17e8699c25610a79f1b40a350f Mon Sep 17 00:00:00 2001
|
|
From: Jan Macku <jamacku@redhat.com>
|
|
Date: Thu, 12 Jun 2025 12:54:26 +0200
|
|
Subject: [PATCH] udev/net_id: introduce naming scheme for RHEL-9.7
|
|
|
|
rhel-only: policy
|
|
|
|
Resolves: RHEL-25516
|
|
---
|
|
man/systemd.net-naming-scheme.xml | 6 ++++++
|
|
src/shared/netif-naming-scheme.c | 1 +
|
|
src/shared/netif-naming-scheme.h | 1 +
|
|
3 files changed, 8 insertions(+)
|
|
|
|
diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml
|
|
index b5f4a0bc51..34e8e46459 100644
|
|
--- a/man/systemd.net-naming-scheme.xml
|
|
+++ b/man/systemd.net-naming-scheme.xml
|
|
@@ -520,6 +520,12 @@
|
|
<listitem><para>Same as naming scheme <constant>rhel-9.5</constant>.</para></listitem>
|
|
</varlistentry>
|
|
|
|
+ <varlistentry>
|
|
+ <term><constant>rhel-9.7</constant></term>
|
|
+
|
|
+ <listitem><para>Same as naming scheme <constant>rhel-9.5</constant>.</para></listitem>
|
|
+ </varlistentry>
|
|
+
|
|
</variablelist>
|
|
|
|
<para>By default <constant>rhel-9.0</constant> is used.</para>
|
|
diff --git a/src/shared/netif-naming-scheme.c b/src/shared/netif-naming-scheme.c
|
|
index 360a603581..a38c3f1e2f 100644
|
|
--- a/src/shared/netif-naming-scheme.c
|
|
+++ b/src/shared/netif-naming-scheme.c
|
|
@@ -46,6 +46,7 @@ static const NamingScheme naming_schemes[] = {
|
|
{ "rhel-9.4", NAMING_RHEL_9_4 },
|
|
{ "rhel-9.5", NAMING_RHEL_9_5 },
|
|
{ "rhel-9.6", NAMING_RHEL_9_6 },
|
|
+ { "rhel-9.7", NAMING_RHEL_9_7 },
|
|
/* … 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 c533d0f37f..3cba656707 100644
|
|
--- a/src/shared/netif-naming-scheme.h
|
|
+++ b/src/shared/netif-naming-scheme.h
|
|
@@ -75,6 +75,7 @@ typedef enum NamingSchemeFlags {
|
|
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_9_7 = NAMING_RHEL_9_5,
|
|
|
|
EXTRA_NET_NAMING_SCHEMES
|
|
|