SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: simplify setting of ImdsNetworkMode default

Browse Source 
This follows the pattern used for dnssec default mode right above.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2026-03-26 17:28:21 +01:00
parent ace4f53b67
commit c3e4e8a527
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meson.build
+1 -1
View File
@@ -1544,7 +1544,7 @@ have = get_option('imds').require(
conf.get('HAVE_LIBCURL') == 1, conf.get('HAVE_LIBCURL') == 1,
error_message : 'curl required').allowed() error_message : 'curl required').allowed()
conf.set10('ENABLE_IMDS', have) conf.set10('ENABLE_IMDS', have)
conf.set10('IMDS_NETWORK_LOCKED_DEFAULT', get_option('imds-network') == 'locked') conf.set('IMDS_NETWORK_DEFAULT', 'IMDS_NETWORK_@0@'.format(get_option('imds-network')).to_upper())
have = get_option('importd').require( have = get_option('importd').require(
conf.get('HAVE_LIBCURL') == 1 and conf.get('HAVE_LIBCURL') == 1 and
src/imds/imds-generator.c
+1 -2
View File
@@ -15,8 +15,7 @@
static int arg_enabled = -1; /* Whether we shall offer local IMDS APIs */ static int arg_enabled = -1; /* Whether we shall offer local IMDS APIs */
static bool arg_import = true; /* Whether we shall import IMDS credentials, SSH keys, … into the local system */ static bool arg_import = true; /* Whether we shall import IMDS credentials, SSH keys, … into the local system */
static ImdsNetworkMode arg_network_mode = static ImdsNetworkMode arg_network_mode = IMDS_NETWORK_DEFAULT;
IMDS_NETWORK_LOCKED_DEFAULT ? IMDS_NETWORK_LOCKED : IMDS_NETWORK_UNLOCKED;
static int parse_proc_cmdline_item(const char *key, const char *value, void *data) { static int parse_proc_cmdline_item(const char *key, const char *value, void *data) {
int r; int r;