Merge pull request #20855 from dannf/update-net-name-schemes

Update net name schemes
This commit is contained in:
Yu Watanabe
2021-09-28 11:28:07 +09:00
committed by GitHub
2 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -201,7 +201,7 @@ option('default-hierarchy', type : 'combo',
choices : ['legacy', 'hybrid', 'unified'], value : 'unified',
description : 'default cgroup hierarchy')
option('default-net-naming-scheme', type : 'combo',
choices : ['latest', 'v238', 'v239', 'v240'],
choices : ['latest', 'v238', 'v239', 'v240', 'v241', 'v243', 'v245', 'v247', 'v249'],
description : 'default net.naming-scheme= value')
option('status-unit-format-default', type : 'combo',
choices : ['description', 'name', 'combined'],
+1
View File
@@ -15,6 +15,7 @@ static const NamingScheme naming_schemes[] = {
{ "v247", NAMING_V247 },
{ "v249", NAMING_V249 },
/* … add more schemes here, as the logic to name devices is updated … */
/* also remember to update the list of options in meson_options.txt */
};
static const NamingScheme* naming_scheme_from_name(const char *name) {