Merge pull request #10262 from keszybz/hibres-disable

Switches to disable hibernation and/or resuming

diff --cc TODO
index 13af83dfe62b930c4e87271138b4d0c7f74d45d7,3a45ff14fe7c8e8936cb96927929ea0bce6c268d..f72dd0f7181a0fc9a4e340d1a38a8a4531887b21
--- 1/TODO
--- 2/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.
  

diff --cc docs/ENVIRONMENT.md
Simple merge