netif-naming-scheme: introduce rhel-10.0 scheme

rhel-only: policy Related:RHEL-71409
redhat-plumbers · Dec 17, 2024 · 4b300ee · 4b300ee
1 parent 7b82fe6
commit 4b300ee
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml
@@ -549,8 +549,17 @@
           <xi:include href="version-info.xml" xpointer="rhel-10.0.beta"/>
           </listitem>
         </varlistentry>
+
+        <varlistentry>
+          <term><constant>rhel-10.0</constant></term>
+
+          <listitem><para>Same as naming scheme <constant>v257</constant>.</para>
+
+          <xi:include href="version-info.xml" xpointer="rhel-10.0"/>
+          </listitem>
+        </varlistentry>
       </variablelist>
-      <para>By default <constant>rhel-10.0-beta</constant> is used.</para>
+      <para>By default <constant>rhel-10.0</constant> is used.</para>
 
       <refsect2>
       <title>RHEL-9 schemes</title>

diff --git a/src/shared/netif-naming-scheme.c b/src/shared/netif-naming-scheme.c
@@ -43,6 +43,7 @@ static const NamingScheme naming_schemes[] = {
         { "rhel-9.4", NAMING_RHEL_9_4 },
         { "rhel-9.5", NAMING_RHEL_9_5 },
         { "rhel-10.0-beta", NAMING_RHEL_10_0_BETA },
+        { "rhel-10.0", NAMING_RHEL_10_0 },
         /* … 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
@@ -86,6 +86,7 @@ typedef enum NamingSchemeFlags {
         NAMING_RHEL_9_5 = NAMING_RHEL_9_4 & ~NAMING_BRIDGE_MULTIFUNCTION_SLOT,
 
         NAMING_RHEL_10_0_BETA = NAMING_V255,
+        NAMING_RHEL_10_0 = NAMING_V257,
 
         EXTRA_NET_NAMING_SCHEMES