Merge pull request #14398 from poettering/mount-prep

diff --cc TODO
index a9902ddff2d5ad98b8858a7fdd3066811606df46,ed5e048d9a09e39e58c174171af0e3426c7bbcfd..4a6c8d3512d4e6e8600552fd804b7bb3e9687b77
--- 1/TODO
--- 2/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
  

diff --cc src/core/unit.c
Simple merge

diff --cc src/shared/generator.c
Simple merge

diff --cc units/meson.build
Simple merge