systemd/SOURCES/0704-udev-net_id-introduce-...

51 lines
1.8 KiB
Diff
Raw Normal View History

2022-05-10 07:18:23 +00:00
From 7ee6542c64103205d6520c1165894b3b6a40f2c9 Mon Sep 17 00:00:00 2001
2022-03-15 09:14:57 +00:00
From: Michal Sekletar <msekleta@redhat.com>
2022-05-10 07:18:23 +00:00
Date: Wed, 12 Jan 2022 15:38:38 +0100
Subject: [PATCH] udev/net_id: introduce naming scheme for RHEL-8.6
2022-03-15 09:14:57 +00:00
RHEL-only
2022-05-10 07:18:23 +00:00
Related: #2039797
2022-03-15 09:14:57 +00:00
---
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
2022-05-10 07:18:23 +00:00
index a65da5c6c1..fe1aa4b654 100644
2022-03-15 09:14:57 +00:00
--- a/man/systemd.net-naming-scheme.xml
+++ b/man/systemd.net-naming-scheme.xml
2022-05-10 07:18:23 +00:00
@@ -307,6 +307,12 @@
<para>Same as naming scheme <constant>rhel-8.4</constant>.</para>
2022-03-15 09:14:57 +00:00
</varlistentry>
+ <varlistentry>
2022-05-10 07:18:23 +00:00
+ <term><constant>rhel-8.6</constant></term>
2022-03-15 09:14:57 +00:00
+
+ <para>Same as naming scheme <constant>rhel-8.4</constant>.</para>
+ </varlistentry>
+
2022-05-10 07:18:23 +00:00
<para>Note that <constant>latest</constant> may be used to denote the latest scheme known to this
2022-03-15 09:14:57 +00:00
particular version of systemd.</para>
</variablelist>
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
2022-05-10 07:18:23 +00:00
index 81139e666b..eafcbb64c5 100644
2022-03-15 09:14:57 +00:00
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -135,6 +135,7 @@ typedef enum NamingSchemeFlags {
NAMING_RHEL_8_3 = NAMING_V239,
NAMING_RHEL_8_4 = NAMING_V239|NAMING_BRIDGE_NO_SLOT,
2022-05-10 07:18:23 +00:00
NAMING_RHEL_8_5 = NAMING_RHEL_8_4,
+ NAMING_RHEL_8_6 = NAMING_RHEL_8_4,
2022-03-15 09:14:57 +00:00
_NAMING_SCHEME_FLAGS_INVALID = -1,
} NamingSchemeFlags;
2022-05-10 07:18:23 +00:00
@@ -153,6 +154,7 @@ static const NamingScheme naming_schemes[] = {
2022-03-15 09:14:57 +00:00
{ "rhel-8.3", NAMING_RHEL_8_3 },
{ "rhel-8.4", NAMING_RHEL_8_4 },
2022-05-10 07:18:23 +00:00
{ "rhel-8.5", NAMING_RHEL_8_5 },
+ { "rhel-8.6", NAMING_RHEL_8_6 },
2022-03-15 09:14:57 +00:00
/* … add more schemes here, as the logic to name devices is updated … */
};