Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-02-02 18:44:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

image: use dissect from nix (#2558)

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
image/measured-boot/cmd/BUILD.bazel
View File

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

2
image/measured-boot/cmd/main.go
View File

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