system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 02:05:05 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

meson: fix printing of first-boot-full-preset

Browse source 
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.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2023-11-08 08:31:13 +01:00 committed by Luca Boccassi
parent 95d0afbfa9
commit 2233035275
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -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('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.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'))
##################################################################### #####################################################################

3
src/core/manager.c
View file

@ -1914,7 +1914,8 @@ static void manager_preset_all(Manager *m) {
return; return;
/* If this is the first boot, and we are in the host system, then preset everything */ /* 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); r = unit_file_preset_all(RUNTIME_SCOPE_SYSTEM, 0, NULL, mode, NULL, 0);
if (r < 0) if (r < 0)