51 lines
1.8 KiB
Diff
51 lines
1.8 KiB
Diff
|
From d45e0cc7a64648dc3ad082b512ff488537d3ebef Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michal Sekletar <msekleta@redhat.com>
|
||
|
|
Date: Wed, 12 Jan 2022 15:35:19 +0100
|
||
|
|
Subject: [PATCH] udev/net_id: introduce naming scheme for RHEL-8.5
|
||
|
|
|
||
|
|
RHEL-only
|
||
|
|
|
||
|
|
Related: #2039797
|
||
|
|
---
|
||
|
|
man/systemd.net-naming-scheme.xml | 6 ++++++
|
||
|
|
src/udev/udev-builtin-net_id.c | 2 ++
|
||
|
|
2 files changed, 8 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml
|
||
|
|
index 10e71dcb15..be969bc8d0 100644
|
||
|
|
--- a/man/systemd.net-naming-scheme.xml
|
||
|
|
+++ b/man/systemd.net-naming-scheme.xml
|
||
|
|
@@ -301,6 +301,12 @@
|
||
|
|
avoid possible naming conflict.</para></listitem>
|
||
|
|
</varlistentry>
|
||
|
|
|
||
|
|
+ <varlistentry>
|
||
|
|
+ <term><constant>rhel-8.5</constant></term>
|
||
|
|
+
|
||
|
|
+ <para>Same as naming scheme <constant>rhel-8.4</constant>.</para>
|
||
|
|
+ </varlistentry>
|
||
|
|
+
|
||
|
|
<para>Note that <constant>latest</constant> may be used to denote the latest scheme known (to this
|
||
|
|
particular version of systemd.</para>
|
||
|
|
</variablelist>
|
||
|
|
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
|
||
|
|
index 7c153f0aef..81139e666b 100644
|
||
|
|
--- a/src/udev/udev-builtin-net_id.c
|
||
|
|
+++ b/src/udev/udev-builtin-net_id.c
|
||
|
|
@@ -134,6 +134,7 @@ typedef enum NamingSchemeFlags {
|
||
|
|
NAMING_RHEL_8_2 = NAMING_V239,
|
||
|
|
NAMING_RHEL_8_3 = NAMING_V239,
|
||
|
|
NAMING_RHEL_8_4 = NAMING_V239|NAMING_BRIDGE_NO_SLOT,
|
||
|
|
+ NAMING_RHEL_8_5 = NAMING_RHEL_8_4,
|
||
|
|
|
||
|
|
_NAMING_SCHEME_FLAGS_INVALID = -1,
|
||
|
|
} NamingSchemeFlags;
|
||
|
|
@@ -151,6 +152,7 @@ static const NamingScheme naming_schemes[] = {
|
||
|
|
{ "rhel-8.2", NAMING_RHEL_8_2 },
|
||
|
|
{ "rhel-8.3", NAMING_RHEL_8_3 },
|
||
|
|
{ "rhel-8.4", NAMING_RHEL_8_4 },
|
||
|
|
+ { "rhel-8.5", NAMING_RHEL_8_5 },
|
||
|
|
/* … add more schemes here, as the logic to name devices is updated … */
|
||
|
|
};
|
||
|
|
|