fold up - mkfs and mount storage

Signed-off-by: Serge Hallyn <[email protected]>

pkg/mosconfig/files.go

@@ -4,10 +4,14 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"path/filepath"
+	"syscall"
 
+	"github.com/apex/log"
 	ispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 	"github.com/project-machine/mos/pkg/trust"
+	"github.com/project-machine/mos/pkg/utils"
 
 	"machinerun.io/disko"
 	"machinerun.io/disko/partid"
@@ -186,6 +190,21 @@ func (i *StorageItem) Create(mos *Mos, allDisks disko.DiskSet, mysys disko.Syste
 		if err := mysys.CreatePartition(d, p); err != nil {
 			return errors.Wrapf(err, "Failed creating storage %#v", i)
 		}
+		dev := filepath.Join("/dev", pathForPartition(d.Name, p.Number))
+		cmd := []string{"mkfs.ext4", "-F", dev}
+		if err := utils.RunCommand(cmd...); err != nil {
+			return errors.Wrapf(err, "Failed creating fs on %#v", i)
+		}
+
+		// mount
+		dest := filepath.Join("/storage", i.Label)
+		if err := utils.EnsureDir(dest); err != nil {
+			return errors.Wrapf(err, "Failed creating mount dir %q", dest)
+		}
+		if err := syscall.Mount(dev, dest, "ext4", 0, ""); err != nil {
+			return errors.Wrapf(err, "Failed mounting %#v", i)
+		}
+		log.Infof("Created and mounted %#v onto %q", i, dest)
 		return nil
 	}
 	return errors.Errorf("Failed to find free space for %#v", i)

pkg/mosconfig/mos.go

@@ -190,7 +190,7 @@ func (mos *Mos) Boot() error {
 	}
 
 	if err := mos.SetupStorage(m); err != nil {
-		return err
+		return errors.Wrapf(err, "Failed setting up storage")
 	}
 	// Now start the services
 	return mos.ActivateAll(m)
@@ -214,11 +214,13 @@ func (mos *Mos) SetupStorage(m *SysManifest) error {
 		}
 	}
 
+	// Create all needed storage partitions, and mount them
 	for _, n := range m.Storage {
 		if err := n.Create(mos, allDisks, sys); err != nil {
 			return errors.Wrapf(err, "Failed creating %#v", n)
 		}
 	}
+
 	return nil
 }
 

pkg/mosconfig/utils.go

@@ -159,3 +159,16 @@ func pingRepo(port int) error {
 	url := fmt.Sprintf("127.0.0.1:%d", port)
 	return PingRepo(url)
 }
+
+func pathForPartition(diskPath string, ptnum uint) string {
+	base := filepath.Base(diskPath)
+	sep := ""
+	for _, pre := range []string{"loop", "nvme", "nbd"} {
+		if strings.HasPrefix(base, pre) {
+			sep = "p"
+			break
+		}
+	}
+
+	return diskPath + sep + fmt.Sprintf("%d", ptnum)
+}