From 06da5c63dd697ea4087e76c6d809b60b5780b87c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Dec 2018 23:28:29 +0100 Subject: meson: make net.naming-scheme= default configurable This is useful for distributions, where the stability of interface names should be preseved after an upgrade of systemd. So when some specific release of the distro is made available, systemd defaults to the latest & greatest naming scheme, and subsequent updates set the same default. This default may still be overriden through the kernel and env var options. A special value "latest" is also allowed. Without a specific name, it is harder to verride from meson. In case of 'combo' options, meson reads the default during the initial configuration, and "remembers" this choice. When systemd is updated, old build/ directories could keep the old default, which would be annoying. Hence, "latest" is introduced to make it explicit, yet follow the upstream. This is actually useful for the user too, because it may be used as an override, without having to actually specify a version. --- meson_options.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meson_options.txt') diff --git a/meson_options.txt b/meson_options.txt index 62167ae92d..1423b8998e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -156,6 +156,9 @@ option('compat-gateway-hostname', type : 'boolean', value : 'false', option('default-hierarchy', type : 'combo', choices : ['legacy', 'hybrid', 'unified'], value : 'hybrid', description : 'default cgroup hierarchy') +option('default-net-naming-scheme', type : 'combo', + choices : ['latest', 'v238', 'v239', 'v240'], + description : 'default net.naming-scheme= value') option('time-epoch', type : 'integer', value : '-1', description : 'time epoch for time clients') option('system-uid-max', type : 'integer', value : '-1', -- cgit v1.2.1