mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-01-06 13:17:44 +03:00
sleep: always thaw user.slice even if freezing failed
`FreezeUnit` can fail even when some units did got frozen, causing some
user units to be frozen. A possible symptom is `user@.service` being
frozen while still being able to log in over SSH.
(cherry picked from commit efa736d383
)
This commit is contained in:
parent
c55426445a
commit
5c1e5944c0
@ -374,7 +374,7 @@ static int freeze_thaw_user_slice(const char **method) {
|
||||
}
|
||||
|
||||
static int execute_s2h(const SleepConfig *sleep_config) {
|
||||
_unused_ _cleanup_(freeze_thaw_user_slice) const char *auto_method_thaw = NULL;
|
||||
_unused_ _cleanup_(freeze_thaw_user_slice) const char *auto_method_thaw = "ThawUnit";
|
||||
int r, k;
|
||||
|
||||
assert(sleep_config);
|
||||
@ -382,8 +382,6 @@ static int execute_s2h(const SleepConfig *sleep_config) {
|
||||
r = freeze_thaw_user_slice(&(const char*) { "FreezeUnit" });
|
||||
if (r < 0)
|
||||
log_debug_errno(r, "Failed to freeze unit user.slice, ignoring: %m");
|
||||
else
|
||||
auto_method_thaw = "ThawUnit"; /* from now on we want automatic thawing */;
|
||||
|
||||
r = check_wakeup_type();
|
||||
if (r < 0)
|
||||
|
Loading…
Reference in New Issue
Block a user