From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 23 Sep 2024 09:30:22 +0000 (+0200)
Subject: Revert "Preset user units on first boot as well"
X-Git-Tag: v257-rc1~346
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b80cef69f00052977ae51d27f21c631266a57ec;p=thirdparty%2Fsystemd.git

Revert "Preset user units on first boot as well"

This reverts commit 0a40325573b91ea71070653865f7f6a9cada2bef.
---

diff --git a/NEWS b/NEWS
index 408a60ddf7b..f368703c904 100644
--- a/NEWS
+++ b/NEWS
@@ -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 844a91b605e..2dddc797222 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) {