diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-12-11 23:28:29 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-12-12 10:09:36 +0100 |
| commit | 06da5c63dd697ea4087e76c6d809b60b5780b87c (patch) | |
| tree | 96f8bdc24a0f4155468534ebfbf065a116c81e96 /meson.build | |
| parent | f7e81fd96fdfe0ac6dcdb72de43f7cb4720e363a (diff) | |
| download | systemd-06da5c63dd697ea4087e76c6d809b60b5780b87c.tar.gz | |
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.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meson.build b/meson.build index 1f44c0fe70..d8e35e618d 100644 --- a/meson.build +++ b/meson.build @@ -694,6 +694,9 @@ else conf.set('DEFAULT_HIERARCHY', 'CGROUP_UNIFIED_ALL') endif +default_net_naming_scheme = get_option('default-net-naming-scheme') +conf.set_quoted('DEFAULT_NET_NAMING_SCHEME', default_net_naming_scheme) + time_epoch = get_option('time-epoch') if time_epoch == -1 NEWS = files('NEWS') @@ -3093,6 +3096,7 @@ status = [ 'default DNSSEC mode: @0@'.format(default_dnssec), 'default DNS-over-TLS mode: @0@'.format(default_dns_over_tls), 'default cgroup hierarchy: @0@'.format(default_hierarchy), + 'default net.naming-scheme setting: @0@'.format(default_net_naming_scheme), 'default KillUserProcesses setting: @0@'.format(kill_user_processes)] alt_dns_servers = '\n '.join(dns_servers.split(' ')) |