56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
From 9ff108d83a19557593c1d0f1687878377e898a54 Mon Sep 17 00:00:00 2001
|
|
From: Lukas Nykryn <lnykryn@redhat.com>
|
|
Date: Wed, 24 Jan 2024 13:49:21 +0100
|
|
Subject: [PATCH] udev/net_id: introduce naming scheme for RHEL-8.10
|
|
|
|
rhel-only
|
|
|
|
Resolves: RHEL-22427
|
|
---
|
|
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 4f06587ec9..3bab402e98 100644
|
|
--- a/man/systemd.net-naming-scheme.xml
|
|
+++ b/man/systemd.net-naming-scheme.xml
|
|
@@ -547,6 +547,12 @@
|
|
<para>Same as naming scheme <constant>rhel-8.7</constant>.</para>
|
|
</varlistentry>
|
|
|
|
+ <varlistentry>
|
|
+ <term><constant>rhel-8.10</constant></term>
|
|
+
|
|
+ <para>Same as naming scheme <constant>rhel-8.7</constant>.</para>
|
|
+ </varlistentry>
|
|
+
|
|
<varlistentry>
|
|
<term><constant>rhel-9.0</constant></term>
|
|
|
|
diff --git a/src/shared/netif-naming-scheme.c b/src/shared/netif-naming-scheme.c
|
|
index bf27f5571b..536ed44b21 100644
|
|
--- a/src/shared/netif-naming-scheme.c
|
|
+++ b/src/shared/netif-naming-scheme.c
|
|
@@ -38,6 +38,7 @@ static const NamingScheme naming_schemes[] = {
|
|
{ "rhel-8.7", NAMING_RHEL_8_7 },
|
|
{ "rhel-8.8", NAMING_RHEL_8_8 },
|
|
{ "rhel-8.9", NAMING_RHEL_8_9 },
|
|
+ { "rhel-8.10", NAMING_RHEL_8_10 },
|
|
{ "rhel-9.0", NAMING_RHEL_9_0 },
|
|
{ "rhel-9.1", NAMING_RHEL_9_1 },
|
|
{ "rhel-9.2", NAMING_RHEL_9_2 },
|
|
diff --git a/src/shared/netif-naming-scheme.h b/src/shared/netif-naming-scheme.h
|
|
index f39c75c64e..5f49157aaa 100644
|
|
--- a/src/shared/netif-naming-scheme.h
|
|
+++ b/src/shared/netif-naming-scheme.h
|
|
@@ -65,6 +65,7 @@ typedef enum NamingSchemeFlags {
|
|
NAMING_RHEL_8_7 = NAMING_RHEL_8_4 | NAMING_SLOT_FUNCTION_ID | NAMING_16BIT_INDEX,
|
|
NAMING_RHEL_8_8 = NAMING_RHEL_8_7,
|
|
NAMING_RHEL_8_9 = NAMING_RHEL_8_7,
|
|
+ NAMING_RHEL_8_10 = NAMING_RHEL_8_7,
|
|
|
|
NAMING_RHEL_9_0 = NAMING_V250 | NAMING_BRIDGE_MULTIFUNCTION_SLOT,
|
|
NAMING_RHEL_9_1 = NAMING_RHEL_9_0,
|