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,17 +392,15 @@ 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) {
-                        if (hibernate_location && swap->priority < hibernate_location->swap->priority) {
+                        log_debug("%s: ignoring device with lower priority", swap->device);
-                                log_debug("%s: ignoring device with lower priority", swap->device);
+                        continue;
-                                continue;
+                }
-                        }
+                if (hibernate_location &&
-                        if (hibernate_location &&
+                    (swap->priority == hibernate_location->swap->priority
-                            (swap->priority == hibernate_location->swap->priority
+                     && swap->size - swap->used < hibernate_location->swap->size - hibernate_location->swap->used)) {
-                             && swap->size - swap->used < hibernate_location->swap->size - hibernate_location->swap->used)) {
+                        log_debug("%s: ignoring device with lower usable space", swap->device);
-                                log_debug("%s: ignoring device with lower usable space", swap->device);
+                        continue;
-                                continue;
-                        }
                 }
 
                 dev_t swap_device;