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/node/core/update/update.go b/metropolis/node/core/update/update.go
index ee53f90..d37bb38 100644
--- a/metropolis/node/core/update/update.go
+++ b/metropolis/node/core/update/update.go
@@ -26,13 +26,13 @@
"google.golang.org/protobuf/proto"
"source.monogon.dev/go/logging"
+ "source.monogon.dev/metropolis/installer/install"
"source.monogon.dev/metropolis/node/core/productinfo"
"source.monogon.dev/osbase/blockdev"
- "source.monogon.dev/osbase/build/mkimage/osimage"
"source.monogon.dev/osbase/efivarfs"
"source.monogon.dev/osbase/gpt"
"source.monogon.dev/osbase/kexec"
- ociosimage "source.monogon.dev/osbase/oci/osimage"
+ "source.monogon.dev/osbase/oci/osimage"
"source.monogon.dev/osbase/oci/registry"
abloaderpb "source.monogon.dev/metropolis/node/abloader/spec"
@@ -88,9 +88,9 @@
func (s Slot) EFIBootPath() string {
switch s {
case SlotA:
- return osimage.EFIBootAPath
+ return install.EFIBootAPath
case SlotB:
- return osimage.EFIBootBPath
+ return install.EFIBootBPath
default:
return ""
}
@@ -294,7 +294,7 @@
return fmt.Errorf("failed to fetch OS image: %w", err)
}
- osImage, err := ociosimage.Read(image)
+ osImage, err := osimage.Read(image)
if err != nil {
return fmt.Errorf("failed to fetch OS image: %w", err)
}
@@ -428,7 +428,7 @@
var abloader []byte
func (s *Service) fixupPreloader() error {
- efiBootPath, err := osimage.EFIBootPath(productinfo.Get().Info.Architecture())
+ efiBootPath, err := install.EFIBootPath(productinfo.Get().Info.Architecture())
if err != nil {
return err
}
@@ -473,7 +473,7 @@
// fixupEFI checks for the existence and correctness of the EFI boot entry
// repairs/recreates it if needed.
func (s *Service) fixupEFI() error {
- efiBootPath, err := osimage.EFIBootPath(productinfo.Get().Info.Architecture())
+ efiBootPath, err := install.EFIBootPath(productinfo.Get().Info.Architecture())
if err != nil {
return err
}