Revert "Preset user units on first boot as well"

This reverts commit 0a40325573.
This commit is contained in:
Lennart Poettering
2024-10-01 17:33:44 +02:00
committed by Daan De Meyer
parent 19b5853f82
commit 5b80cef69f
2 changed files with 6 additions and 13 deletions
-3
View File
@@ -78,9 +78,6 @@ CHANGES WITH 257 in spe:
Service and system management:
* Global user units are now enabled or disabled based on preset files
on first boot as well just like system units are already.
* Environment variable $REMOTE_ADDR is now set when using socket
activation for AF_UNIX sockets.
+6 -10
View File
@@ -1936,16 +1936,12 @@ static void manager_preset_all(Manager *m) {
UnitFilePresetMode mode =
ENABLE_FIRST_BOOT_FULL_PRESET ? UNIT_FILE_PRESET_FULL : UNIT_FILE_PRESET_ENABLE_ONLY;
RuntimeScope scope;
FOREACH_ARGUMENT(scope, RUNTIME_SCOPE_SYSTEM, RUNTIME_SCOPE_GLOBAL) {
r = unit_file_preset_all(scope, 0, NULL, mode, NULL, 0);
if (r < 0)
log_full_errno(r == -EEXIST ? LOG_NOTICE : LOG_WARNING, r,
"Failed to populate /etc with %s preset unit settings, ignoring: %m", runtime_scope_to_string(scope));
else
log_info("Populated /etc with %s preset unit settings.", runtime_scope_to_string(scope));
}
r = unit_file_preset_all(RUNTIME_SCOPE_SYSTEM, 0, NULL, mode, NULL, 0);
if (r < 0)
log_full_errno(r == -EEXIST ? LOG_NOTICE : LOG_WARNING, r,
"Failed to populate /etc with preset unit settings, ignoring: %m");
else
log_info("Populated /etc with preset unit settings.");
}
static void manager_ready(Manager *m) {