image: use dissect from nix (#2558)

This commit is contained in:
Malte Poll 2023-11-06 17:50:21 +01:00 committed by GitHub
parent ac4ac6a148
commit 4fe51cd5f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 9 deletions

View File

@ -21,13 +21,8 @@ go_binary(
],
embed = [":cmd_lib"],
# keep
# TODO(malt3): The commented out env variable
# means we are using `systemd-dissect` from the host.
# `systemd-dissect` from nixpkgs breaks GitHub actions runners
# for unknown reasons.
# Fix this.
# env = {
# "DISSECT_TOOLCHAIN": "$(rootpath @systemd//:bin/systemd-dissect)",
# },
env = {
"DISSECT_TOOLCHAIN": "$(rootpath @systemd//:bin/systemd-dissect)",
},
visibility = ["//visibility:public"],
)

View File

@ -23,7 +23,7 @@ import (
)
const (
ukiPath = "/efi/EFI/BOOT/BOOTX64.EFI"
ukiPath = "/boot/EFI/BOOT/BOOTX64.EFI"
)
func precalculatePCRs(fs afero.Fs, dissectToolchain, imageFile string) (*measure.Simulator, error) {