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/cli/takeover/BUILD.bazel b/metropolis/cli/takeover/BUILD.bazel
index 1b8f182..8e51836 100644
--- a/metropolis/cli/takeover/BUILD.bazel
+++ b/metropolis/cli/takeover/BUILD.bazel
@@ -30,12 +30,12 @@
visibility = ["//visibility:private"],
deps = [
"//go/logging",
+ "//metropolis/installer/install",
"//metropolis/node/core/devmgr",
"//metropolis/proto/api",
"//osbase/blockdev",
"//osbase/bootparam",
"//osbase/bringup",
- "//osbase/build/mkimage/osimage",
"//osbase/efivarfs",
"//osbase/kexec",
"//osbase/net/dump",
diff --git a/metropolis/cli/takeover/install.go b/metropolis/cli/takeover/install.go
index 37068ed..4d42269 100644
--- a/metropolis/cli/takeover/install.go
+++ b/metropolis/cli/takeover/install.go
@@ -10,11 +10,11 @@
"path/filepath"
"source.monogon.dev/go/logging"
+ "source.monogon.dev/metropolis/installer/install"
"source.monogon.dev/osbase/blockdev"
- "source.monogon.dev/osbase/build/mkimage/osimage"
"source.monogon.dev/osbase/efivarfs"
"source.monogon.dev/osbase/oci"
- ociosimage "source.monogon.dev/osbase/oci/osimage"
+ "source.monogon.dev/osbase/oci/osimage"
"source.monogon.dev/osbase/structfs"
)
@@ -47,7 +47,7 @@
return err
}
- be, err := osimage.Write(installParams)
+ be, err := install.Write(installParams)
if err != nil {
return fmt.Errorf("failed to apply installation: %w", err)
}
@@ -62,13 +62,13 @@
return nil
}
-func setupOSImageParams(image *oci.Image, metropolisSpecRaw []byte, installTarget string) (*osimage.Params, error) {
+func setupOSImageParams(image *oci.Image, metropolisSpecRaw []byte, installTarget string) (*install.Params, error) {
rootDev, err := blockdev.Open(filepath.Join("/dev", installTarget))
if err != nil {
return nil, fmt.Errorf("failed to open root device: %w", err)
}
- osImage, err := ociosimage.Read(image)
+ osImage, err := osimage.Read(image)
if err != nil {
return nil, fmt.Errorf("failed to read OS image: %w", err)
}
@@ -82,8 +82,8 @@
return nil, fmt.Errorf("cannot open system image in OS image: %w", err)
}
- return &osimage.Params{
- PartitionSize: osimage.PartitionSizeInfo{
+ return &install.Params{
+ PartitionSize: install.PartitionSizeInfo{
ESP: 384,
System: 4096,
Data: 128,
diff --git a/metropolis/cli/takeover/takeover.go b/metropolis/cli/takeover/takeover.go
index cd537a9..805a06d 100644
--- a/metropolis/cli/takeover/takeover.go
+++ b/metropolis/cli/takeover/takeover.go
@@ -18,8 +18,8 @@
apb "source.monogon.dev/metropolis/proto/api"
netapi "source.monogon.dev/osbase/net/proto"
+ "source.monogon.dev/metropolis/installer/install"
"source.monogon.dev/osbase/bootparam"
- "source.monogon.dev/osbase/build/mkimage/osimage"
"source.monogon.dev/osbase/kexec"
netdump "source.monogon.dev/osbase/net/dump"
"source.monogon.dev/osbase/oci"
@@ -136,7 +136,7 @@
}
// Validate that this installation will not fail because of disk issues
- if _, err := osimage.Plan(oParams); err != nil {
+ if _, err := install.Plan(oParams); err != nil {
return nil, fmt.Errorf("failed to plan installation: %w", err)
}