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

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.

diff --git a/meson.build b/meson.build
index 32a181e50d2963cc5754957c5cf7519d4c0b2860..373d0c16171c5e99f8252f6bc68bcbb271319551 100644 (file)
--- 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 6b9ce2d2ec475ad251f5d01587caf37bc6a9ebbe..89702e8606fbefe6c8a6f0488ec58bc5d85d4435 100644 (file)
--- 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)