From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 4 Feb 2020 14:36:17 +0000 (+0100)
Subject: Merge pull request #14398 from poettering/mount-prep
X-Git-Tag: v245-rc1~16
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fsystemd.git;a=commitdiff_plain;h=dc9fd22d3dae5bf9d4d5185a5d15c7e5eca70d82

Merge pull request #14398 from poettering/mount-prep
---

dc9fd22d3dae5bf9d4d5185a5d15c7e5eca70d82
diff --cc TODO
index a9902ddff2d,ed5e048d9a0..4a6c8d3512d
--- a/TODO
+++ b/TODO
@@@ -41,9 -24,9 +41,12 @@@ Features
  * honour specifiers in unit files that resolve to some very basic
    /etc/os-release data, such as ID, VERSION_ID, BUILD_ID, VARIANT_ID.
  
 +* cryptsetup: allow encoding key directly in /etc/crypttab, maybe with a
 +  "base64:" prefix. Useful in particular for pkcs11 mode.
 +
+ * cryptsetup: reimplement the mkswap/mke2fs in cryptsetup-generator to use
+   systemd-makefs.service instead.
+ 
  * socket units: allow creating a udev monitor socket with ListenDevices= or so,
    with matches, then actviate app thorugh that passing socket oveer