Merge pull request #2283 from tedyu/runc-path-in-prefix

isPathInPrefixList return value should be reverted
This commit is contained in:
Michael Crosby
2020-04-02 14:09:49 -04:00
committed by GitHub
+3 -3
View File
@@ -1204,10 +1204,10 @@ func (c *linuxContainer) makeCriuRestoreMountpoints(m *configs.Mount) error {
func isPathInPrefixList(path string, prefix []string) bool {
for _, p := range prefix {
if strings.HasPrefix(path, p+"/") {
return false
return true
}
}
return true
return false
}
// prepareCriuRestoreMounts tries to set up the rootfs of the
@@ -1229,7 +1229,7 @@ func (c *linuxContainer) prepareCriuRestoreMounts(mounts []*configs.Mount) error
// if the mountpoints are not on a tmpfs, as CRIU will
// restore the complete tmpfs content from its checkpoint.
for _, m := range mounts {
if isPathInPrefixList(m.Destination, tmpfs) {
if !isPathInPrefixList(m.Destination, tmpfs) {
if err := c.makeCriuRestoreMountpoints(m); err != nil {
return err
}