From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 8 Oct 2018 19:39:54 +0000 (+0200)
Subject: Merge pull request #10262 from keszybz/hibres-disable
X-Git-Tag: v240~611
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1634ebb54a8955ab01dac9a59fc16f02f16cf007;p=thirdparty%2Fsystemd.git

Merge pull request #10262 from keszybz/hibres-disable

Switches to disable hibernation and/or resuming
---

1634ebb54a8955ab01dac9a59fc16f02f16cf007
diff --cc TODO
index 13af83dfe62,3a45ff14fe7..f72dd0f7181
--- a/TODO
+++ b/TODO
@@@ -96,12 -86,12 +96,9 @@@ Features
  
    1. add resume_offset support to the resume code (i.e. support swap files
       properly)
-   2. check of swap is on weird storage and refuse if so
-   3. add env-var based option to disable hibernation
-   4. figure out what to do with swap-on-luks
-   5. add autodetection of hibernation images, and add "noresume" to disable
-      this
+   2. check if swap is on weird storage and refuse if so
+   3. add autodetection of hibernation images
  
 -* portables: introduce a new unit file directory /etc/systemd/system.attached/
 -  or so, where we attach portable services to
 -
  * cgroups: use inotify to get notified when somebody else modifies cgroups
    owned by us, then log a friendly warning.