Merge pull request microsoft#119 from Microsoft/mount

Tar2vhd should use -t ext4 when calling mount.

Author: soccerGB

service/gcsutils/libtar2vhd/tar2vhd.go

@@ -7,8 +7,8 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"github.com/sirupsen/logrus"
 	"github.com/docker/docker/pkg/archive"
+	"github.com/sirupsen/logrus"
 
 	"github.com/Microsoft/opengcs/service/gcsutils/fs"
 	"github.com/Microsoft/opengcs/service/gcsutils/tarlib"
@@ -86,7 +86,7 @@ func VHD2Tar(in io.Reader, out io.Writer, options *Options) (int64, error) {
 	}
 	defer os.RemoveAll(mntFolder)
 
-	if err := exec.Command("mount", "-o", "loop", vhdFile.Name(), mntFolder).Run(); err != nil {
+	if err := exec.Command("mount", "-t", "ext4", "-o", "loop", vhdFile.Name(), mntFolder).Run(); err != nil {
 		return 0, err
 	}
 	defer exec.Command("umount", mntFolder).Run()

service/gcsutils/tarlib/tardisk.go

@@ -11,8 +11,8 @@ import (
 	"path"
 
 	"github.com/Microsoft/opengcs/service/gcsutils/fs"
-	"github.com/sirupsen/logrus"
 	"github.com/docker/docker/pkg/archive"
+	"github.com/sirupsen/logrus"
 )
 
 func createEmptyDisk(in io.Reader,
@@ -148,7 +148,7 @@ func CreateTarDisk(in io.Reader,
 	}
 
 	// Mount the disk and remove the lost+found folder that might appear from mkfs
-	if err := exec.Command("mount", "-o", "loop", disk.Name(), mntFolder).Run(); err != nil {
+	if err := exec.Command("mount", "-t", "ext4", "-o", "loop", disk.Name(), mntFolder).Run(); err != nil {
 		logrus.Infof("failed mount -o loop %s", err)
 		return 0, err
 	}