From 2233035275d3d1575f101161309ac116838db558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 8 Nov 2023 08:31:13 +0100 Subject: [PATCH] meson: fix printing of first-boot-full-preset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The meson summary logic checks for ENABLE_* and HAVE_*, but we used a define with no prefix. Let's make it ENABLE_… for consistency with other config options. Obviously this also fixes the summary output. --- meson.build | 2 +- src/core/manager.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 32a181e50d..373d0c1617 100644 --- a/meson.build +++ b/meson.build @@ -288,7 +288,7 @@ conf.set('DEFAULT_TIMEOUT_SEC', get_option('defaul conf.set('DEFAULT_USER_TIMEOUT_SEC', get_option('default-user-timeout-sec')) conf.set('UPDATE_HELPER_USER_TIMEOUT_SEC', get_option('update-helper-user-timeout-sec')) -conf.set10('FIRST_BOOT_FULL_PRESET', get_option('first-boot-full-preset')) +conf.set10('ENABLE_FIRST_BOOT_FULL_PRESET', get_option('first-boot-full-preset')) ##################################################################### diff --git a/src/core/manager.c b/src/core/manager.c index 6b9ce2d2ec..89702e8606 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1914,7 +1914,8 @@ static void manager_preset_all(Manager *m) { return; /* If this is the first boot, and we are in the host system, then preset everything */ - UnitFilePresetMode mode = FIRST_BOOT_FULL_PRESET ? UNIT_FILE_PRESET_FULL : UNIT_FILE_PRESET_ENABLE_ONLY; + UnitFilePresetMode mode = + ENABLE_FIRST_BOOT_FULL_PRESET ? UNIT_FILE_PRESET_FULL : UNIT_FILE_PRESET_ENABLE_ONLY; r = unit_file_preset_all(RUNTIME_SCOPE_SYSTEM, 0, NULL, mode, NULL, 0); if (r < 0)