systemd: Wrap in LUKS2 tokens

Update pkgs/os-specific/linux/systemd/default.nix

Co-authored-by: Janne Heß <janne@hess.ooo>
Co-authored-by: Ilan Joselevich <personal@ilanjoselevich.com>
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
This commit is contained in:
Zhaofeng Li 2022-09-23 15:47:05 -06:00
parent f42cdfe227
commit 570824e102
2 changed files with 13 additions and 1 deletions

View file

@ -403,6 +403,9 @@ in {
# so NSS can look up usernames # so NSS can look up usernames
"${pkgs.glibc}/lib/libnss_files.so.2" "${pkgs.glibc}/lib/libnss_files.so.2"
] ++ optionals cfg.package.withCryptsetup [
# the unwrapped systemd-cryptsetup executable
"${cfg.package}/lib/systemd/.systemd-cryptsetup-wrapped"
] ++ jobScripts; ] ++ jobScripts;
targets.initrd.aliases = ["default.target"]; targets.initrd.aliases = ["default.target"];

View file

@ -7,6 +7,7 @@
, fetchpatch , fetchpatch
, fetchzip , fetchzip
, buildPackages , buildPackages
, makeBinaryWrapper
, ninja , ninja
, meson , meson
, m4 , m4
@ -332,6 +333,7 @@ stdenv.mkDerivation {
nativeBuildInputs = nativeBuildInputs =
[ [
pkg-config pkg-config
makeBinaryWrapper
gperf gperf
ninja ninja
meson meson
@ -666,7 +668,14 @@ stdenv.mkDerivation {
preFixup = lib.optionalString withEfi '' preFixup = lib.optionalString withEfi ''
mv $out/lib/systemd/boot/efi $out/dont-strip-me mv $out/lib/systemd/boot/efi $out/dont-strip-me
''; '';
postFixup = lib.optionalString withEfi ''
# Wrap in the correct path for LUKS2 tokens.
postFixup = lib.optionalString withCryptsetup ''
for f in lib/systemd/systemd-cryptsetup bin/systemd-cryptenroll; do
# This needs to be in LD_LIBRARY_PATH because rpath on a binary is not propagated to libraries using dlopen, in this case `libcryptsetup.so`
wrapProgram $out/$f --prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib/cryptsetup
done
'' + lib.optionalString withEfi ''
mv $out/dont-strip-me $out/lib/systemd/boot/efi mv $out/dont-strip-me $out/lib/systemd/boot/efi
''; '';