commit edffbb5a67e79fdb075c382995eaa0b52a16bfdd
author Mateusz Zalega <mateusz@monogon.tech> Tue Jan 11 15:27:22 2022 +0100
committer Mateusz Zalega <mateusz@monogon.tech> Wed Jan 12 15:20:32 2022 +0000
tree 7941e1dfb40d13b00dbcd1071c3e7ecfdaee3963
parent 950c26d52a08499ebf45ee2b4b0e46d3bea66dee

m/{t,n}/installer: move to m/installer

Change-Id: I8fd15f1fa1e151369df251d1469e84cfeffd26fd
Reviewed-on: https://review.monogon.dev/c/monogon/+/510
Reviewed-by: Sergiusz Bazanski <serge@monogon.tech>

metropolis/cli/metroctl/BUILD.bazel

diff --git a/metropolis/cli/metroctl/BUILD.bazel b/metropolis/cli/metroctl/BUILD.bazel
index f9b8b51..b73b418 100644
--- a/metropolis/cli/metroctl/BUILD.bazel
+++ b/metropolis/cli/metroctl/BUILD.bazel
@@ -8,8 +8,8 @@
         "takeownership.go",
     ],
     data = [
+        "//metropolis/installer:kernel",
         "//metropolis/node",
-        "//metropolis/node/installer:kernel",
     ],
     importpath = "source.monogon.dev/metropolis/cli/metroctl",
     visibility = ["//visibility:private"],

metropolis/cli/metroctl/install.go

diff --git a/metropolis/cli/metroctl/install.go b/metropolis/cli/metroctl/install.go
index d2ca453..c314fad 100644
--- a/metropolis/cli/metroctl/install.go
+++ b/metropolis/cli/metroctl/install.go
@@ -34,7 +34,7 @@
 const ownerKeyType = "METROPOLIS INITIAL OWNER PRIVATE KEY"
 
 func doGenUSB(cmd *cobra.Command, args []string) {
-	installer := datafile.MustGet("metropolis/node/installer/kernel.efi")
+	installer := datafile.MustGet("metropolis/installer/kernel.efi")
 	bundle := datafile.MustGet("metropolis/node/node.zip")
 
 	// TODO(lorenz): Have a key management story for this