LICENSES/README.md

@@ -39,6 +39,7 @@ The following exceptions apply:
  * the following sources are licensed under the **MIT** license (in case of our
    scripts, to facilitate copying and reuse of those helpers to other projects):
    - hwdb.d/parse_hwdb.py
+   - man/glib-event-glue.c
    - src/basic/linux/batman_adv.h
    - src/basic/sparse-endian.h
    - tools/catalog-report.py

man/glib-event-glue.c

@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: CC0-1.0 */
+/* SPDX-License-Identifier: MIT */
 
 #include <stdlib.h>
 #include <glib.h>

src/shared/sleep-config.c

@@ -392,7 +392,6 @@ int find_hibernate_location(HibernateLocation **ret_hibernate_location) {
                 }
 
                 /* prefer resume device or highest priority swap with most remaining space */
-                if (sys_resume == 0) {
                 if (hibernate_location && swap->priority < hibernate_location->swap->priority) {
                         log_debug("%s: ignoring device with lower priority", swap->device);
                         continue;
@@ -403,7 +402,6 @@ int find_hibernate_location(HibernateLocation **ret_hibernate_location) {
                         log_debug("%s: ignoring device with lower usable space", swap->device);
                         continue;
                 }
-                }
 
                 dev_t swap_device;
                 r = swap_device_to_device_id(swap, &swap_device);