m/installer/install: move from osbase/build/mkimage/osimage
Move the package osbase/build/mkimage/osimage to
metropolis/installer/install. The package contains "metropolis" in
various strings, so it fits better in //metropolis than in //osbase.
The parent package mkimage no longer exists.
The rename also removes the name clash with osbase/oci/osimage.
Change-Id: Ia228ab94c937f4c7a5b6eb1fcc77993a594d64b6
Reviewed-on: https://review.monogon.dev/c/monogon/+/4296
Tested-by: Jenkins CI
Reviewed-by: Tim Windelschmidt <tim@monogon.tech>
diff --git a/metropolis/test/launch/cluster.go b/metropolis/test/launch/cluster.go
index 1e3f42b..744c0cc 100644
--- a/metropolis/test/launch/cluster.go
+++ b/metropolis/test/launch/cluster.go
@@ -47,13 +47,13 @@
"source.monogon.dev/go/logging"
metroctl "source.monogon.dev/metropolis/cli/metroctl/core"
+ "source.monogon.dev/metropolis/installer/install"
"source.monogon.dev/metropolis/node"
"source.monogon.dev/metropolis/node/core/rpc"
"source.monogon.dev/metropolis/node/core/rpc/resolver"
"source.monogon.dev/osbase/blockdev"
- "source.monogon.dev/osbase/build/mkimage/osimage"
"source.monogon.dev/osbase/oci"
- ociosimage "source.monogon.dev/osbase/oci/osimage"
+ "source.monogon.dev/osbase/oci/osimage"
"source.monogon.dev/osbase/oci/registry"
"source.monogon.dev/osbase/structfs"
"source.monogon.dev/osbase/test/qemu"
@@ -170,7 +170,7 @@
if err != nil {
return nil, fmt.Errorf("failed to read OS image: %w", err)
}
- osImage, err := ociosimage.Read(ociImage)
+ osImage, err := osimage.Read(ociImage)
if err != nil {
return nil, fmt.Errorf("failed to read OS image: %w", err)
}
@@ -198,8 +198,8 @@
}
defer df.Close()
- installParams := &osimage.Params{
- PartitionSize: osimage.PartitionSizeInfo{
+ installParams := &install.Params{
+ PartitionSize: install.PartitionSizeInfo{
ESP: 128,
System: 1024,
Data: 128,
@@ -210,7 +210,8 @@
ABLoader: abloader,
Output: df,
}
- if _, err := osimage.Write(installParams); err != nil {
+
+ if _, err := install.Write(installParams); err != nil {
return nil, fmt.Errorf("while creating node image: %w", err)
}