mirror of
https://github.com/systemd/systemd
synced 2025-09-30 17:24:46 +02:00
Compare commits
7 Commits
e8628ddb78
...
ef72263f06
Author | SHA1 | Date | |
---|---|---|---|
![]() |
ef72263f06 | ||
![]() |
dac478c44c | ||
![]() |
f78a482393 | ||
![]() |
7bb8e9e82f | ||
![]() |
9ce6d08196 | ||
![]() |
ce3b12713b | ||
![]() |
8f6236164c |
@ -79,7 +79,7 @@ typedef enum LoaderType {
|
||||
#define LOADER_TYPE_PROCESS_RANDOM_SEED(t) IN_SET(t, LOADER_LINUX, LOADER_UKI, LOADER_TYPE2_UKI)
|
||||
|
||||
/* Whether to persistently save the selected entry in an EFI variable, if that's requested. */
|
||||
#define LOADER_TYPE_SAVE_ENTRY(t) IN_SET(t, LOADER_EFI, LOADER_LINUX, LOADER_UKI, LOADER_UKI_URL, LOADER_TYPE2_UKI)
|
||||
#define LOADER_TYPE_SAVE_ENTRY(t) IN_SET(t, LOADER_AUTO, LOADER_EFI, LOADER_LINUX, LOADER_UKI, LOADER_UKI_URL, LOADER_TYPE2_UKI)
|
||||
|
||||
typedef enum {
|
||||
REBOOT_NO,
|
||||
|
@ -4098,7 +4098,7 @@ static int setup_keyring(
|
||||
return log_error_errno(errno, "Failed to change GID back for user keyring: %m");
|
||||
}
|
||||
|
||||
/* Populate they keyring with the invocation ID by default, as original saved_uid. */
|
||||
/* Populate the keyring with the invocation ID by default, as original saved_uid. */
|
||||
if (!sd_id128_is_null(p->invocation_id)) {
|
||||
key_serial_t key;
|
||||
|
||||
|
@ -71,6 +71,8 @@ static int parse_pull_expression(const char *v) {
|
||||
return log_error_errno(r, "Failed to extract local name from pull expression '%s': %m", v);
|
||||
if (r == 0)
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "No local string in pull expression '%s'.", v);
|
||||
if (isempty(p))
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "No remote string in pull expression '%s'.", v);
|
||||
|
||||
_cleanup_free_ char *remote = strdup(p);
|
||||
if (!remote)
|
||||
|
@ -2959,7 +2959,7 @@ static int wait_for_container(PidRef *pid, ContainerStatus *container) {
|
||||
}
|
||||
|
||||
static int on_orderly_shutdown(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata) {
|
||||
PidRef *pid = ASSERT_PTR(userdata);
|
||||
PidRef *pid = userdata;
|
||||
|
||||
assert(si);
|
||||
|
||||
|
@ -1060,6 +1060,12 @@ static int fd_set_perms(
|
||||
}
|
||||
|
||||
shortcut:
|
||||
if (arg_dry_run) {
|
||||
log_debug("Would relabel \"%s\"", path);
|
||||
return 0;
|
||||
}
|
||||
|
||||
log_debug("Relabelling \"%s\"", path);
|
||||
return label_fix_full(fd, /* inode_path= */ NULL, /* label_path= */ path, 0);
|
||||
}
|
||||
|
||||
|
@ -304,13 +304,13 @@ void manager_exit(Manager *manager) {
|
||||
manager->varlink_server = sd_varlink_server_unref(manager->varlink_server);
|
||||
(void) manager_serialize_config(manager);
|
||||
|
||||
/* Disable the event source, but does not close the inotify fd here, as we may still receive
|
||||
/* Disable the event source, but do not close the inotify fd here, as we may still receive
|
||||
* notification messages about requests to add or remove inotify watches. */
|
||||
manager->inotify_event = sd_event_source_disable_unref(manager->inotify_event);
|
||||
|
||||
/* Disable the device monitor but do not free device monitor, as it may be used when a worker failed,
|
||||
* and the manager needs to broadcast the kernel event assigned to the worker to libudev listeners.
|
||||
* Note, hwere we cannot use sd_device_monitor_stop(), as it changes the multicast group of the socket. */
|
||||
* Note, here we cannot use sd_device_monitor_stop(), as it changes the multicast group of the socket. */
|
||||
(void) sd_event_source_set_enabled(sd_device_monitor_get_event_source(manager->monitor), SD_EVENT_OFF);
|
||||
(void) sd_device_monitor_detach_event(manager->monitor);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user