From c3e4e8a527316b125572a70a00dd401bfdf0329a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 26 Mar 2026 17:28:21 +0100 Subject: [PATCH] meson: simplify setting of ImdsNetworkMode default This follows the pattern used for dnssec default mode right above. --- meson.build | 2 +- src/imds/imds-generator.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 2893bea332..03e337dccb 100644 --- a/meson.build +++ b/meson.build @@ -1544,7 +1544,7 @@ have = get_option('imds').require( conf.get('HAVE_LIBCURL') == 1, error_message : 'curl required').allowed() 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( conf.get('HAVE_LIBCURL') == 1 and diff --git a/src/imds/imds-generator.c b/src/imds/imds-generator.c index 9cb48688a8..42399783fa 100644 --- a/src/imds/imds-generator.c +++ b/src/imds/imds-generator.c @@ -15,8 +15,7 @@ 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 ImdsNetworkMode arg_network_mode = - IMDS_NETWORK_LOCKED_DEFAULT ? IMDS_NETWORK_LOCKED : IMDS_NETWORK_UNLOCKED; +static ImdsNetworkMode arg_network_mode = IMDS_NETWORK_DEFAULT; static int parse_proc_cmdline_item(const char *key, const char *value, void *data) { int r;