Skip to content

Commit

Permalink
Merge pull request #4013 from kinvolk/rata/relax-dst-path-rel
Browse files Browse the repository at this point in the history
validator: Relax warning for not abs mount dst path
  • Loading branch information
lifubang authored Sep 12, 2023
2 parents e897a16 + b17c6f2 commit a3a0ec4
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions libcontainer/configs/validate/validator.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ func Validate(config *configs.Config) error {
}
// Relaxed validation rules for backward compatibility
warns := []check{
mounts, // TODO (runc v1.x.x): make this an error instead of a warning
mountsWarn,
}
for _, c := range warns {
if err := c(config); err != nil {
logrus.WithError(err).Warn("invalid configuration")
logrus.WithError(err).Warn("configuration")
}
}
return nil
Expand Down Expand Up @@ -300,10 +300,10 @@ func checkIDMapMounts(config *configs.Config, m *configs.Mount) error {
return nil
}

func mounts(config *configs.Config) error {
func mountsWarn(config *configs.Config) error {
for _, m := range config.Mounts {
if !filepath.IsAbs(m.Destination) {
return fmt.Errorf("invalid mount %+v: mount destination not absolute", m)
return fmt.Errorf("mount %+v: relative destination path is **deprecated**, using it as relative to /", m)
}
}
return nil
Expand Down

0 comments on commit a3a0ec4

Please sign in to comment.