Skip to content

Commit 472f502

Browse files
author
Ma Shimiao
authored
Merge pull request #324 from Mashimiao/cleanup-remove-defaultfs-check
cleanup: remove defaultfs validaton
2 parents 9539bef + 28c2564 commit 472f502

File tree

1 file changed

+0
-33
lines changed

1 file changed

+0
-33
lines changed

cmd/runtimetest/main.go

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,6 @@ const PR_GET_NO_NEW_PRIVS = 39
2929
const specConfig = "config.json"
3030

3131
var (
32-
defaultFS = map[string]string{
33-
"/proc": "proc",
34-
"/sys": "sysfs",
35-
"/dev/pts": "devpts",
36-
"/dev/shm": "tmpfs",
37-
}
38-
3932
defaultSymlinks = map[string]string{
4033
"/dev/fd": "/proc/self/fd",
4134
"/dev/stdin": "/proc/self/fd/0",
@@ -271,28 +264,6 @@ func validateRootFS(spec *rspec.Spec) error {
271264
return nil
272265
}
273266

274-
func validateDefaultFS(spec *rspec.Spec) error {
275-
logrus.Debugf("validating linux default filesystem")
276-
277-
mountInfos, err := mount.GetMounts()
278-
if err != nil {
279-
return err
280-
}
281-
282-
mountsMap := make(map[string]string)
283-
for _, mountInfo := range mountInfos {
284-
mountsMap[mountInfo.Mountpoint] = mountInfo.Fstype
285-
}
286-
287-
for fs, fstype := range defaultFS {
288-
if !(mountsMap[fs] == fstype) {
289-
return fmt.Errorf("%v must exist and expected type is %v", fs, fstype)
290-
}
291-
}
292-
293-
return nil
294-
}
295-
296267
func validateLinuxDevices(spec *rspec.Spec) error {
297268
logrus.Debugf("validating linux devices")
298269

@@ -612,10 +583,6 @@ func validate(context *cli.Context) error {
612583
test: validateDefaultSymlinks,
613584
description: "default symlinks",
614585
},
615-
{
616-
test: validateDefaultFS,
617-
description: "default file system",
618-
},
619586
{
620587
test: validateDefaultDevices,
621588
description: "default devices",

0 commit comments

Comments
 (0)