parse: support copy-symlink option

Support a new copy-symlink mount option supported by crun 1.11+. Required in containers/podman/pull/20356. Part-of: issues.redhat.com/browse/RUN-1935 Signed-off-by: Valentin Rothberg <[email protected]>
containers · Nov 21, 2023 · 216d18e · 216d18e
1 parent 37f046e
commit 216d18e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pkg/parse/parse.go b/pkg/parse/parse.go
@@ -14,7 +14,7 @@ import (
 
 // ValidateVolumeOpts validates a volume's options
 func ValidateVolumeOpts(options []string) ([]string, error) {
- var foundRootPropagation, foundRWRO, foundLabelChange, bindType, foundExec, foundDev, foundSuid, foundChown, foundUpperDir, foundWorkDir, foundCopy int
+ var foundRootPropagation, foundRWRO, foundLabelChange, bindType, foundExec, foundDev, foundSuid, foundChown, foundUpperDir, foundWorkDir, foundCopy, foundCopySymlink int
  finalOpts := make([]string, 0, len(options))
  for _, opt := range options {
  // support advanced options like upperdir=/path, workdir=/path
@@ -93,6 +93,11 @@ func ValidateVolumeOpts(options []string) ([]string, error) {
  if foundCopy > 1 {
  return nil, fmt.Errorf("invalid options %q, can only specify 1 'copy' or 'nocopy' option", strings.Join(options, ", "))
  }
+ case "no-dereference":
+ foundCopySymlink++
+ if foundCopySymlink > 1 {
+ return nil, fmt.Errorf("invalid options %q, can only specify 1 'no-dereference' option", strings.Join(options, ", "))
+ }
  default:
  return nil, fmt.Errorf("invalid option type %q", opt)
  }