compose: handle --fs option to support both ZFS and ROFS

Signed-off-by: Waldemar Kozaczuk <[email protected]>

capstan.go

@@ -250,6 +250,7 @@ func main() {
 				&cli.StringFlag{Name: "size", Aliases: []string{"s"}, Value: "10G", Usage: "size of the target user partition (use M or G suffix)"},
 				&cli.StringFlag{Name: "command_line", Aliases: []string{"c"}, Usage: "command line OSv will boot with"},
 				&cli.BoolFlag{Name: "verbose", Aliases: []string{"v"}, Usage: "verbose mode"},
+				&cli.StringFlag{Name: "fs", Usage: "specify type of filesystem: zfs or rofs"},
 			},
 			Action: func(c *cli.Context) error {
 				if c.Args().Len() != 2 {
@@ -274,7 +275,12 @@ func main() {
 					return cli.NewExitError(fmt.Sprintf("Incorrect image size format: %s\n", err), EX_DATAERR)
 				}
 
-				if err := cmd.Compose(repo, loaderImage, imageSize, uploadPath, appName, commandLine, verbose); err != nil {
+				filesystem := c.String("fs")
+				if filesystem == "" || (filesystem != "zfs" && filesystem != "rofs") {
+					filesystem = "zfs"
+				}
+
+				if err := cmd.Compose(repo, loaderImage, imageSize, filesystem, uploadPath, appName, commandLine, verbose); err != nil {
 					return cli.NewExitError(err.Error(), EX_DATAERR)
 				}
 				return nil

cmd/compose.go

@@ -21,33 +21,53 @@ import (
 	"io/ioutil"
 	"net"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 )
 
-func Compose(r *util.Repo, loaderImage string, imageSize int64, uploadPath string, appName string, commandLine string, verbose bool) error {
-	zfsBuilderPath, err := r.GetZfsBuilderImagePath()
-	if err != nil {
-		return err
-	}
-	// Initialize an empty image based on the provided loader image. imageSize is used to
-	// determine the size of the user partition.
-	err = r.InitializeZfsImage(loaderImage, appName, imageSize)
+func Compose(r *util.Repo, loaderImage string, imageSize int64, filesystem string, uploadPath string, appName string, commandLine string, verbose bool) error {
+	// If all is well, we have to start preparing the files for upload.
+	paths, err := CollectPathContents(uploadPath)
 	if err != nil {
 		return err
 	}
 
 	// Get the path of imported image.
 	imagePath := r.ImagePath("qemu", appName)
 
-	paths, err := CollectPathContents(uploadPath)
-	if err != nil {
-		return err
-	}
+	if filesystem == "zfs" {
+		// Create ZFS
+		zfsBuilderPath, err := r.GetZfsBuilderImagePath()
+		if err != nil {
+			return err
+		}
+		// Initialize an empty image based on the provided loader image. imageSize is used to
+		// determine the size of the user partition.
+		err = r.InitializeZfsImage(loaderImage, appName, imageSize)
+		if err != nil {
+			return err
+		}
 
-	// Upload the specified path onto virtual image.
-	if _, err = UploadPackageContents(r, imagePath, paths, nil, verbose, zfsBuilderPath); err != nil {
-		return err
+		// Upload the specified path onto virtual image.
+		if _, err = UploadPackageContents(r, imagePath, paths, nil, verbose, zfsBuilderPath); err != nil {
+			return err
+		}
+	} else {
+		// Create ROFS
+		// Create temporary folder in which the image will be composed.
+		tmp, _ := ioutil.TempDir("", "capstan")
+		// Once this function is finished, remove temporary file.
+		defer os.RemoveAll(tmp)
+		rofs_image_path := path.Join(tmp, "rofs.img")
+
+		if err := util.WriteRofsImage(rofs_image_path, paths, uploadPath, verbose); err != nil {
+			return fmt.Errorf("Failed to write ROFS image named %s.\nError was: %s", rofs_image_path, err)
+		}
+
+		if err = r.CreateRofsImage(loaderImage, appName, rofs_image_path); err != nil {
+			return fmt.Errorf("Failed to create ROFS image named %s.\nError was: %s", appName, err)
+		}
 	}
 
 	if commandLine != "" {