src/core/exec-invoke.c

@@ -4468,12 +4468,6 @@ static void log_command_line(
 
 static bool exec_needs_cap_sys_admin(const ExecContext *context, const ExecParameters *params) {
         assert(context);
-        assert(params);
-
-        /* We only want to ever imply PrivateUsers= for user managers, as they're not expected to setuid() to
-         * other users, unlike the system manager which needs all users to be around. */
-        if (params->runtime_scope != RUNTIME_SCOPE_USER)
-                return false;
 
         return context->private_users != PRIVATE_USERS_NO ||
                context->private_tmp != PRIVATE_TMP_NO ||

src/core/main.c

@@ -2639,10 +2639,12 @@ static int do_queue_default_job(
                 return log_struct_errno(LOG_EMERG, r,
                                         LOG_MESSAGE("Failed to isolate default target: %s", bus_error_message(&error, r)),
                                         LOG_MESSAGE_ID(SD_MESSAGE_CORE_ISOLATE_TARGET_FAILED_STR));
-        }
-
+        } else
                 log_info("Queued %s job for default target %s.",
-                 job_type_to_string(job->type), unit_status_string(job->unit, NULL));
+                         job_type_to_string(job->type),
+                         unit_status_string(job->unit, NULL));
+
+        m->default_unit_job_id = job->id;
 
         return 0;
 }

src/core/manager.h

@@ -173,7 +173,7 @@ typedef struct Manager {
         LIST_HEAD(Unit, load_queue); /* this is actually more a stack than a queue, but uh. */
 
         /* Jobs that need to be run */
-        Prioq *run_queue;
+        struct Prioq *run_queue;
 
         /* Units and jobs that have not yet been announced via
          * D-Bus. When something about a job changes it is added here
@@ -321,15 +321,18 @@ typedef struct Manager {
 
         Hashmap *watch_bus;  /* D-Bus names => Unit object n:1 */
 
+        bool send_reloading_done;
+
         uint32_t current_job_id;
+        uint32_t default_unit_job_id;
 
         /* Data specific to the Automount subsystem */
         int dev_autofs_fd;
 
         /* Data specific to the cgroup subsystem */
         Hashmap *cgroup_unit;
-        char *cgroup_root;
         CGroupMask cgroup_supported;
+        char *cgroup_root;
 
         /* Notifications from cgroups, when the unified hierarchy is used is done via inotify. */
         int cgroup_inotify_fd;
@@ -362,8 +365,6 @@ typedef struct Manager {
         bool dispatching_load_queue;
         int may_dispatch_stop_notify_queue; /* tristate */
 
-        bool send_reloading_done;
-
         /* Have we already sent out the READY=1 notification? */
         bool ready_sent;
 

src/shared/tar-util.c

@@ -529,7 +529,7 @@ static int archive_entry_read_acl(
 
                 r = acl_set_perm(p, ACL_EXECUTE, permset & ARCHIVE_ENTRY_ACL_EXECUTE);
                 if (r < 0)
-                        return log_error_errno(r, "Failed to set ACL entry execute bit: %m");
+                        return log_error_errno(r, "Failed to set ACL entry excute bit: %m");
 
                 if (sym_acl_set_permset(e, p) < 0)
                         return log_error_errno(errno, "Failed to set ACL entry permission set: %m");

src/tpm2-setup/tpm2-setup.c

@@ -467,7 +467,7 @@ static int setup_nvpcr(void) {
 
         if (c.n_already > 0 && c.n_anchored == 0 && !arg_early) {
                 /* If we didn't anchor anything right now, but we anchored something earlier, then it might
-                 * have happened in the initrd, and thus the anchor ID was not committed to /var/ or the ESP
+                 * have happened in the initrd, and thus the anchor ID was not commited to /var/ or the ESP
                  * yet. Hence, let's explicitly do so now, to catch up. */
 
                 r = tpm2_nvpcr_acquire_anchor_secret(/* ret= */ NULL, /* sync_secondary= */ true);