76 lines
3.1 KiB
Diff
76 lines
3.1 KiB
Diff
From c3300ddbcdd138da8bd3fb31d0f35a20f5b6ca13 Mon Sep 17 00:00:00 2001
|
|
From: Lukas Nykryn <lnykryn@redhat.com>
|
|
Date: Thu, 22 Aug 2024 13:42:11 +0200
|
|
Subject: [PATCH] netif-naming-scheme: rename rhel-10.0 to rhel-10.0.beta
|
|
|
|
rhel-only: policy
|
|
Related: RHEL-55728
|
|
---
|
|
man/systemd.net-naming-scheme.xml | 6 +++---
|
|
man/version-info.xml | 1 +
|
|
src/shared/netif-naming-scheme.c | 2 +-
|
|
src/shared/netif-naming-scheme.h | 2 +-
|
|
4 files changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml
|
|
index e458b5dd6b..610a05485b 100644
|
|
--- a/man/systemd.net-naming-scheme.xml
|
|
+++ b/man/systemd.net-naming-scheme.xml
|
|
@@ -526,15 +526,15 @@
|
|
</varlistentry>
|
|
|
|
<varlistentry>
|
|
- <term><constant>rhel-10.0</constant></term>
|
|
+ <term><constant>rhel-10.0-beta</constant></term>
|
|
|
|
<listitem><para>PCI slot number is now read from <constant>firmware_node/sun</constant> sysfs file.</para>
|
|
|
|
- <xi:include href="version-info.xml" xpointer="rhel-10.0"/>
|
|
+ <xi:include href="version-info.xml" xpointer="rhel-10.0.beta"/>
|
|
</listitem>
|
|
</varlistentry>
|
|
</variablelist>
|
|
- <para>By default <constant>rhel-10.0</constant> is used.</para>
|
|
+ <para>By default <constant>rhel-10.0-beta</constant> is used.</para>
|
|
|
|
<refsect2>
|
|
<title>RHEL-9 schemes</title>
|
|
diff --git a/man/version-info.xml b/man/version-info.xml
|
|
index 274450d408..c05cebfbe2 100644
|
|
--- a/man/version-info.xml
|
|
+++ b/man/version-info.xml
|
|
@@ -103,6 +103,7 @@
|
|
<para id="rhel-9.8">Added in rhel-9.8.</para>
|
|
<para id="rhel-9.9">Added in rhel-9.9.</para>
|
|
<para id="rhel-9.10">Added in rhel-9.10.</para>
|
|
+ <para id="rhel-10.0.beta">Added in rhel-10.0-beta.</para>
|
|
<para id="rhel-10.0">Added in rhel-10.0.</para>
|
|
<para id="rhel-10.1">Added in rhel-10.1.</para>
|
|
<para id="rhel-10.2">Added in rhel-10.2.</para>
|
|
diff --git a/src/shared/netif-naming-scheme.c b/src/shared/netif-naming-scheme.c
|
|
index 149794e926..cb5f8c5d38 100644
|
|
--- a/src/shared/netif-naming-scheme.c
|
|
+++ b/src/shared/netif-naming-scheme.c
|
|
@@ -41,7 +41,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-10.0", NAMING_RHEL_10_0 },
|
|
+ { "rhel-10.0-beta", NAMING_RHEL_10_0_BETA },
|
|
/* … 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 229232d452..2e2023ba5b 100644
|
|
--- a/src/shared/netif-naming-scheme.h
|
|
+++ b/src/shared/netif-naming-scheme.h
|
|
@@ -83,7 +83,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_FIRMWARE_NODE_SUN,
|
|
|
|
- NAMING_RHEL_10_0 = NAMING_V255 | NAMING_FIRMWARE_NODE_SUN,
|
|
+ NAMING_RHEL_10_0_BETA = NAMING_V255 | NAMING_FIRMWARE_NODE_SUN,
|
|
|
|
EXTRA_NET_NAMING_SCHEMES
|
|
|