Merge pull request #772 from thaJeztah/use_mountinfo

cmd/runtimetest: use github.com/moby/sys/mountinfo

Author: hqhq

cmd/runtimetest/main.go

@@ -20,7 +20,7 @@ import (
 	"github.com/syndtr/gocapability/capability"
 	"github.com/urfave/cli"
 
-	"github.com/opencontainers/runtime-tools/cmd/runtimetest/mount"
+	"github.com/moby/sys/mountinfo"
 	rfc2119 "github.com/opencontainers/runtime-tools/error"
 	"github.com/opencontainers/runtime-tools/specerror"
 	"github.com/opencontainers/selinux/go-selinux/label"
@@ -620,14 +620,14 @@ func (c *complianceTester) validateRootfsPropagation(spec *rspec.Spec) error {
 }
 
 func (c *complianceTester) validateDefaultFS(spec *rspec.Spec) error {
-	mountInfos, err := mount.GetMounts()
+	mountInfos, err := mountinfo.GetMounts(nil)
 	if err != nil {
 		return nil
 	}
 
 	mountsMap := make(map[string]string)
 	for _, mountInfo := range mountInfos {
-		mountsMap[mountInfo.Mountpoint] = mountInfo.Fstype
+		mountsMap[mountInfo.Mountpoint] = mountInfo.FSType
 	}
 
 	for fs, fstype := range defaultFS {
@@ -1091,10 +1091,10 @@ func (c *complianceTester) validateGIDMappings(spec *rspec.Spec) error {
 	return c.validateIDMappings(spec.Linux.GIDMappings, "/proc/self/gid_map", "linux.gidMappings")
 }
 
-func mountMatch(configMount rspec.Mount, sysMount *mount.Info) error {
+func mountMatch(configMount rspec.Mount, sysMount *mountinfo.Info) error {
 	sys := rspec.Mount{
 		Destination: sysMount.Mountpoint,
-		Type:        sysMount.Fstype,
+		Type:        sysMount.FSType,
 		Source:      sysMount.Source,
 	}
 
@@ -1137,7 +1137,7 @@ func (c *complianceTester) validatePosixMounts(spec *rspec.Spec) error {
 		return nil
 	}
 
-	mountInfos, err := mount.GetMounts()
+	mountInfos, err := mountinfo.GetMounts(nil)
 	if err != nil {
 		return err
 	}

cmd/runtimetest/mount/README.md

@@ -7,6 +7,7 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b
+	github.com/moby/sys/mountinfo v0.7.2
 	github.com/mrunalp/fileutils v0.5.0
 	github.com/opencontainers/runtime-spec v1.1.0
 	github.com/opencontainers/selinux v1.9.1

cmd/runtimetest/mount/mountinfo.go

@@ -11,6 +11,8 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+l
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b h1:Ga1nclDSe8gOw37MVLMhfu2QKWtD6gvtQ298zsKVh8g=
 github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b/go.mod h1:pzzDgJWZ34fGzaAZGFW22KVZDfyrYW+QABMrWnJBnSs=
+github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg=
+github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4=
 github.com/mrunalp/fileutils v0.5.0 h1:NKzVxiH7eSk+OQ4M+ZYW1K6h27RUV3MI6NUTsHhU6Z4=
 github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
 github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg=