diff options
| author | Egor <egor@opensrc.club> | 2021-10-03 02:42:50 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2021-10-04 10:23:42 +0200 |
| commit | 936a7cb66a0b423e75ceef87f02537067ad17002 (patch) | |
| tree | d1f8409fc9d588f3568f9bc79052bf937ce6ec61 /src/shared/sleep-config.c | |
| parent | Merge pull request #20924 from weblate/weblate-systemd-master (diff) | |
| download | systemd-936a7cb66a0b423e75ceef87f02537067ad17002.tar.xz systemd-936a7cb66a0b423e75ceef87f02537067ad17002.zip | |
sleep: don't skip resume device with low priority/available space
this fixes hibernation when there's a higher priority swap preceding
the resume swap in /proc/swaps.
fixes #19486
Diffstat (limited to 'src/shared/sleep-config.c')
| -rw-r--r-- | src/shared/sleep-config.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c index dbaecb3a0f..8ec3d09a58 100644 --- a/src/shared/sleep-config.c +++ b/src/shared/sleep-config.c @@ -392,15 +392,17 @@ int find_hibernate_location(HibernateLocation **ret_hibernate_location) { } /* prefer resume device or highest priority swap with most remaining space */ - if (hibernate_location && swap->priority < hibernate_location->swap->priority) { - log_debug("%s: ignoring device with lower priority", swap->device); - continue; - } - if (hibernate_location && - (swap->priority == hibernate_location->swap->priority - && swap->size - swap->used < hibernate_location->swap->size - hibernate_location->swap->used)) { - log_debug("%s: ignoring device with lower usable space", swap->device); - continue; + if (sys_resume == 0) { + if (hibernate_location && swap->priority < hibernate_location->swap->priority) { + log_debug("%s: ignoring device with lower priority", swap->device); + continue; + } + if (hibernate_location && + (swap->priority == hibernate_location->swap->priority + && swap->size - swap->used < hibernate_location->swap->size - hibernate_location->swap->used)) { + log_debug("%s: ignoring device with lower usable space", swap->device); + continue; + } } dev_t swap_device; |