Cleanup

pkg/mount/fs.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/containerd/containerd/mount"
 	"github.com/deniswernert/go-fstab"
-	"github.com/kairos-io/immucore/pkg/profile"
 	"github.com/kairos-io/kairos/pkg/utils"
 	"github.com/moby/sys/mountinfo"
 )
@@ -35,7 +34,7 @@ func appendSlash(path string) string {
 }
 
 // https://github.com/kairos-io/packages/blob/94aa3bef3d1330cb6c6905ae164f5004b6a58b8c/packages/system/dracut/immutable-rootfs/30cos-immutable-rootfs/cos-mount-layout.sh#L129
-func baseOverlay(overlay profile.Overlay) (mountOperation, error) {
+func baseOverlay(overlay Overlay) (mountOperation, error) {
 	if err := os.MkdirAll(overlay.Base, 0700); err != nil {
 		return mountOperation{}, err
 	}

pkg/mount/mount.go

@@ -3,17 +3,17 @@ package mount
 import (
 	"context"
 	"fmt"
-	"github.com/rs/zerolog"
 	"os"
 	"path/filepath"
 	"strings"
 	"time"
 
+	"github.com/rs/zerolog"
+
 	"github.com/containerd/containerd/mount"
 	"github.com/deniswernert/go-fstab"
 	"github.com/hashicorp/go-multierror"
 	"github.com/joho/godotenv"
-	"github.com/kairos-io/immucore/pkg/profile"
 	"github.com/kairos-io/kairos/pkg/utils"
 	"github.com/spectrocloud-labs/herd"
 )
@@ -274,7 +274,7 @@ func (s *State) Register(g *herd.Graph) error {
 		err = g.Add(opMountBaseOverlay,
 			herd.WithCallback(
 				func(ctx context.Context) error {
-					op, err := baseOverlay(profile.Overlay{
+					op, err := baseOverlay(Overlay{
 						Base:        "/run/overlay",
 						BackingBase: "tmpfs:20%",
 					})

pkg/mount/schema.go

@@ -1,4 +1,4 @@
-package profile
+package mount
 
 type Layout struct {
 	Overlay  Overlay

pkg/prepare/overlay.go

@@ -1,32 +0,0 @@
-package prepare
-
-/*
-func hasMountpoint(path string, mounts []string) bool {
-	for _, mount := range mounts {
-		if strings.HasSuffix(mount, path) {
-			return true
-		}
-	}
-	return false
-}
-
-func getStateMountpoints(statePaths []string, mountpoints []string) string {
-	var stateMounts string
-	for _, path := range statePaths {
-		if !hasMountpoint(path, mountpoints) {
-			stateMounts += path + " "
-		}
-	}
-	return stateMounts
-}
-func getOverlayMountpoints(rwPaths []string, mounts []string) string {
-	var mountpoints string
-
-	for _, path := range rwPaths {
-		if !hasMountpoint(path, mounts) {
-			mountpoints += path + ":overlay "
-		}
-	}
-	return mountpoints
-}
-*/

pkg/profile/loader.go

@@ -1,7 +0,0 @@
-package profile
-
-func Apply() {
-	// Load all profiles
-	// Apply mounts
-	// Apply configurations to sysroot (/) or (/sysroot)
-}

pkg/profile/mount.go

@@ -1,4 +0,0 @@
-package profile
-
-// profile.Mount mounts a profile to the system.
-func Mount() {}