diff options
| author | Lennart Poettering <lennart@poettering.net> | 2024-09-23 11:30:22 +0200 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-10-01 17:33:44 +0200 |
| commit | 5b80cef69f00052977ae51d27f21c631266a57ec (patch) | |
| tree | 8baf5f7c7f3711544296b58c44836199d2404a34 | |
| parent | update TODO (diff) | |
| download | systemd-5b80cef69f00052977ae51d27f21c631266a57ec.tar.xz systemd-5b80cef69f00052977ae51d27f21c631266a57ec.zip | |
Revert "Preset user units on first boot as well"
This reverts commit 0a40325573b91ea71070653865f7f6a9cada2bef.
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | src/core/manager.c | 16 |
2 files changed, 6 insertions, 13 deletions
@@ -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. diff --git a/src/core/manager.c b/src/core/manager.c index 844a91b605..2dddc79722 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -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) { |