metropolis: align EFI partition layout
This moves non-EFI-related data inside the ESP from under the EFI
subdirectory to the root. The data moved is never accessed from EFI and
thus shouldn't be under the EFI folder. This also aligns localstorage
with the new layout as previously it and osimage didn't agree on a
specific layout, indirectly breaking the installer.
Change-Id: I36bdc9782e181dafab40aaa85cc0b4eaf2448f6e
Reviewed-on: https://review.monogon.dev/c/monogon/+/483
Reviewed-by: Sergiusz Bazanski <serge@monogon.tech>
diff --git a/metropolis/node/build/mkimage/osimage/osimage.go b/metropolis/node/build/mkimage/osimage/osimage.go
index 5aeeccd..d730e68 100644
--- a/metropolis/node/build/mkimage/osimage/osimage.go
+++ b/metropolis/node/build/mkimage/osimage/osimage.go
@@ -42,7 +42,7 @@
ESPVolumeLabel = "ESP"
EFIPayloadPath = "/EFI/BOOT/BOOTx64.EFI"
- nodeParamsPath = "/EFI/metropolis/parameters.pb"
+ nodeParamsPath = "/metropolis/parameters.pb"
mib = 1024 * 1024
)
@@ -87,7 +87,7 @@
}
// Create the EFI partition structure.
- for _, dir := range []string{"/EFI", "/EFI/BOOT", "/EFI/metropolis"} {
+ for _, dir := range []string{"/EFI", "/EFI/BOOT", "/metropolis"} {
if err := fs.Mkdir(dir); err != nil {
return fmt.Errorf("while creating %q: %w", dir, err)
}