image: use dissect from nix (#2558)

edgelesssys · Nov 6, 2023 · 4fe51cd · 4fe51cd
1 parent ac4ac6a
commit 4fe51cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/image/measured-boot/cmd/BUILD.bazel b/image/measured-boot/cmd/BUILD.bazel
@@ -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"],
 )
diff --git a/image/measured-boot/cmd/main.go b/image/measured-boot/cmd/main.go
@@ -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) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -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) {
@@ Expand Down @@