]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #29296 from keszybz/make-cryptsetup-offical-and-add-docs
authorLuca Boccassi <bluca@debian.org>
Wed, 27 Sep 2023 12:31:11 +0000 (13:31 +0100)
committerGitHub <noreply@github.com>
Wed, 27 Sep 2023 12:31:11 +0000 (13:31 +0100)
Make cryptsetup offical and add docs

1  2 
TODO
man/rules/meson.build
man/systemd-measure.xml
meson.build
test/units/testsuite-70.sh

diff --cc TODO
Simple merge
Simple merge
Simple merge
diff --cc meson.build
Simple merge
index 3c534235730aebe6758c6012d3115fb8d73086e6,1fe47ae74812f0595984e23bb1a64d8b3cadaacd..faa9db7cdd06e36626a9a2603c1c2185234c8b87
@@@ -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() {