56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
|
From 63b7060ef28895ce56bb058912e8e81bd00b8395 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jan Macku <jamacku@redhat.com>
|
||
|
|
Date: Tue, 23 Jan 2024 15:23:05 +0100
|
||
|
|
Subject: [PATCH] udev/net_id: introduce naming scheme for RHEL-9.4
|
||
|
|
|
||
|
|
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 639c03262f..4f06587ec9 100644
|
||
|
|
--- a/man/systemd.net-naming-scheme.xml
|
||
|
|
+++ b/man/systemd.net-naming-scheme.xml
|
||
|
|
@@ -582,6 +582,12 @@
|
||
|
|
</listitem>
|
||
|
|
</varlistentry>
|
||
|
|
|
||
|
|
+ <varlistentry>
|
||
|
|
+ <term><constant>rhel-9.4</constant></term>
|
||
|
|
+
|
||
|
|
+ <listitem><para>Same as naming scheme <constant>rhel-9.3</constant>.</para></listitem>
|
||
|
|
+ </varlistentry>
|
||
|
|
+
|
||
|
|
</variablelist>
|
||
|
|
|
||
|
|
<para>Note that <constant>latest</constant> may be used to denote the latest scheme known (to this
|
||
|
|
diff --git a/src/shared/netif-naming-scheme.c b/src/shared/netif-naming-scheme.c
|
||
|
|
index e73c265371..bf27f5571b 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.1", NAMING_RHEL_9_1 },
|
||
|
|
{ "rhel-9.2", NAMING_RHEL_9_2 },
|
||
|
|
{ "rhel-9.3", NAMING_RHEL_9_3 },
|
||
|
|
+ { "rhel-9.4", NAMING_RHEL_9_4 },
|
||
|
|
/* … 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 3baa7d5e72..f39c75c64e 100644
|
||
|
|
--- a/src/shared/netif-naming-scheme.h
|
||
|
|
+++ b/src/shared/netif-naming-scheme.h
|
||
|
|
@@ -70,6 +70,7 @@ typedef enum NamingSchemeFlags {
|
||
|
|
NAMING_RHEL_9_1 = NAMING_RHEL_9_0,
|
||
|
|
NAMING_RHEL_9_2 = NAMING_RHEL_9_0,
|
||
|
|
NAMING_RHEL_9_3 = NAMING_RHEL_9_0 | NAMING_SR_IOV_R,
|
||
|
|
+ NAMING_RHEL_9_4 = NAMING_RHEL_9_3,
|
||
|
|
|
||
|
|
EXTRA_NET_NAMING_SCHEMES
|
||
|
|
|