From: Luca Boccassi <bluca@debian.org>
Date: Wed, 27 Sep 2023 12:31:11 +0000 (+0100)
Subject: Merge pull request #29296 from keszybz/make-cryptsetup-offical-and-add-docs
X-Git-Tag: v255-rc1~415
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=578840bdf95e1c542c2d646bb03415a2e07cb613;p=thirdparty%2Fsystemd.git

Merge pull request #29296 from keszybz/make-cryptsetup-offical-and-add-docs

Make cryptsetup offical and add docs
---

578840bdf95e1c542c2d646bb03415a2e07cb613
diff --cc test/units/testsuite-70.sh
index 3c534235730,1fe47ae7481..faa9db7cdd0
--- a/test/units/testsuite-70.sh
+++ b/test/units/testsuite-70.sh
@@@ -3,9 -3,8 +3,8 @@@
  set -ex
  set -o pipefail
  
- SD_CRYPTSETUP="/usr/lib/systemd/systemd-cryptsetup"
  SD_MEASURE="/usr/lib/systemd/systemd-measure"
 -SD_PCRPHASE="/usr/lib/systemd/systemd-pcrphase"
 +SD_PCREXTEND="/usr/lib/systemd/systemd-pcrextend"
  export SYSTEMD_LOG_LEVEL=debug
  
  cryptsetup_has_token_plugin_support() {