mirror of
https://github.com/systemd/systemd
synced 2026-03-17 18:44:46 +01:00
Compare commits
2 Commits
311fddcd8d
...
5119063196
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5119063196 | ||
|
|
bcbf80c43d |
@ -2278,6 +2278,11 @@ int manager_propagate_reload(Manager *m, Unit *unit, JobMode mode, sd_bus_error
|
||||
tr->anchor_job,
|
||||
mode == JOB_IGNORE_DEPENDENCIES ? TRANSACTION_IGNORE_ORDER : 0);
|
||||
|
||||
/* Only activate the transaction if it contains jobs other than NOP anchor.
|
||||
* Short-circuiting here avoids unnecessary processing, such as emitting D-Bus signals. */
|
||||
if (hashmap_size(tr->jobs) <= 1)
|
||||
return 0;
|
||||
|
||||
r = transaction_activate(tr, m, mode, NULL, e);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
@ -850,7 +850,7 @@ static int run(int argc, char *argv[]) {
|
||||
return r;
|
||||
|
||||
/* A delicious drop of snake oil */
|
||||
(void) mlockall(MCL_FUTURE);
|
||||
(void) mlockall(MCL_CURRENT|MCL_FUTURE|MCL_ONFAULT);
|
||||
|
||||
cryptsetup_enable_logging(NULL);
|
||||
|
||||
|
||||
@ -2582,7 +2582,7 @@ static int verb_attach(int argc, char *argv[], void *userdata) {
|
||||
volume, source, strempty(arg_type), strempty(arg_cipher));
|
||||
|
||||
/* A delicious drop of snake oil */
|
||||
(void) mlockall(MCL_FUTURE);
|
||||
(void) mlockall(MCL_CURRENT|MCL_FUTURE|MCL_ONFAULT);
|
||||
|
||||
if (key_file && arg_keyfile_erase)
|
||||
destroy_key_file = key_file; /* let's get this baby erased when we leave */
|
||||
|
||||
@ -402,7 +402,8 @@ int main(int argc, char *argv[]) {
|
||||
init_watchdog();
|
||||
|
||||
/* Lock us into memory */
|
||||
(void) mlockall(MCL_CURRENT|MCL_FUTURE);
|
||||
(void) mlockall(MCL_FUTURE|MCL_ONFAULT);
|
||||
(void) mlockall(MCL_CURRENT);
|
||||
|
||||
/* We need to make mounts private so that we can MS_MOVE in unmount_all(). Kernel does not allow
|
||||
* MS_MOVE when parent mountpoints have shared propagation. */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user