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/core/cluster/cluster.go b/metropolis/node/core/cluster/cluster.go
index 144a47b..fe29abd 100644
--- a/metropolis/node/core/cluster/cluster.go
+++ b/metropolis/node/core/cluster/cluster.go
@@ -101,7 +101,7 @@
state.oneway = true
unlock()
- configuration, err := m.storageRoot.ESP.SealedConfiguration.Unseal()
+ configuration, err := m.storageRoot.ESP.Metropolis.SealedConfiguration.Unseal()
if err == nil {
supervisor.Logger(ctx).Info("Sealed configuration present. attempting to join cluster")
return m.join(ctx, configuration)
@@ -213,7 +213,7 @@
} else {
supervisor.Logger(ctx).Infof("Retrieved node parameters from qemu fwcfg")
}
- paramsESP, err := m.storageRoot.ESP.NodeParameters.Unmarshal()
+ paramsESP, err := m.storageRoot.ESP.Metropolis.NodeParameters.Unmarshal()
if err != nil {
supervisor.Logger(ctx).Warningf("Could not retrieve node parameters from ESP: %v", err)
paramsESP = nil