shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-28 02:50:16 +03:00
Code

net_id: fix newly added naming scheme name

Browse Source 
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)
This commit is contained in:
Lennart Poettering 2020-10-22 14:03:57 +02:00
parent da7511d575
commit 66ad93e86d
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
man/systemd.net-naming-scheme.xml
View File

@ -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>

2
src/shared/netif-naming-scheme.c
View File

@ -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 … */
};

2
src/shared/netif-naming-scheme.h
View File

@ -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;