net_id: fix newly added naming scheme name

v246 is long released. Hence the new scheme should be named v247.

(Interesting, how we pretty systematically for the last releases changed
the scheme only every second release)

diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml
index b33488b9e4d724f3f43c3b85e0d211ab6f1719e8..e894db7cd6a7457d4ea1b15ff1430c8e0d851eef 100644 (file)
--- a/man/systemd.net-naming-scheme.xml
+++ b/man/systemd.net-naming-scheme.xml
@@ -270,7 +270,8 @@
   <refsect1>
     <title>History</title>
 
-    <para>The following "naming schemes" have been defined:</para>
+    <para>The following "naming schemes" have been defined (which may be chosen at system boot-up time via
+    the <varname>net.naming-scheme=</varname> kernel command line switch, see above:</para>
 
     <variablelist>
         <varlistentry>
@@ -359,7 +360,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term><constant>v246</constant></term>
+          <term><constant>v247</constant></term>
 
           <listitem><para>If the PCI slot is assocated with PCI bridge and that has multiple child network
           controllers then all of them might derive the same value of <varname>ID_NET_NAME_SLOT</varname>

diff --git a/src/shared/netif-naming-scheme.c b/src/shared/netif-naming-scheme.c
index 338ff661f39dc221a416d57a59ae1fe74d29455b..0a701b0e92218ed313141e2d6e8ca9a1ae50333a 100644 (file)
--- a/src/shared/netif-naming-scheme.c
+++ b/src/shared/netif-naming-scheme.c
@@ -12,7 +12,7 @@ static const NamingScheme naming_schemes[] = {
         { "v241", NAMING_V241 },
         { "v243", NAMING_V243 },
         { "v245", NAMING_V245 },
-        { "v246", NAMING_V246 },
+        { "v247", NAMING_V247 },
         /* … add more schemes here, as the logic to name devices is updated … */
 };
 

diff --git a/src/shared/netif-naming-scheme.h b/src/shared/netif-naming-scheme.h
index e12464b6a34b005e3a110d4d5e1b03f798f54045..db47d2909ea28a0b454315b23dcfd1eb57079322 100644 (file)
--- a/src/shared/netif-naming-scheme.h
+++ b/src/shared/netif-naming-scheme.h
@@ -40,7 +40,7 @@ typedef enum NamingSchemeFlags {
         NAMING_V241 = NAMING_V240 | NAMING_STABLE_VIRTUAL_MACS,
         NAMING_V243 = NAMING_V241 | NAMING_NETDEVSIM | NAMING_LABEL_NOPREFIX,
         NAMING_V245 = NAMING_V243 | NAMING_NSPAWN_LONG_HASH,
-        NAMING_V246 = NAMING_V245 | NAMING_BRIDGE_NO_SLOT,
+        NAMING_V247 = NAMING_V245 | NAMING_BRIDGE_NO_SLOT,
 
         _NAMING_SCHEME_FLAGS_INVALID = -1,
 } NamingSchemeFlags;