Merge pull request #738 from fidencio/wip/virtiofs

mount: Use "virtiofs" instead of "virtio_fs"
kata-containers · Apr 14, 2020 · 5bf8d4c · 5bf8d4c
2 parents 73afd1a + 6cbeed5
commit 5bf8d4c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/mount.go b/mount.go
@@ -27,7 +27,7 @@ import (
 
 const (
 	type9pFs       = "9p"
-	typeVirtioFS   = "virtio_fs"
+	typeVirtioFS   = "virtiofs"
 	typeRootfs     = "rootfs"
 	typeTmpFs      = "tmpfs"
 	procMountStats = "/proc/self/mountstats"

diff --git a/mount_test.go b/mount_test.go
@@ -486,14 +486,14 @@ func TestMount(t *testing.T) {
 		{"", "/foo", "9p", 0, "", true},
 		{"proc", "", "9p", 0, "", true},
 		{"proc", "/proc", "", 0, "", true},
-		{"proc", "", "virtio_fs", 0, "", true},
-		{"proc", subdir, "virtio_fs", 0, "", true},
+		{"proc", "", "virtiofs", 0, "", true},
+		{"proc", subdir, "virtiofs", 0, "", true},
 		{"proc", subdir, "foo", 0, "", true},
 		{symLinkName, symLinkDest, "moo", 0, "", true},
 		{existsFile, existingNonCreatableFile, "bind", 0, "", true},
 		{"tmpfs", validSubdir, "tmpfs", 0, "", true},
 		{"proc", validSubdir, "9p", 0, "", true},
-		{"proc", validSubdir, "virtio_fs", 0, "", true},
+		{"proc", validSubdir, "virtiofs", 0, "", true},
 	}
 
 	for i, d := range data {