Merge pull request #1747 from vrothberg/RUN-1935

parse: support `no-dereference` mount option
containers · Nov 21, 2023 · d54dcfe · d54dcfe
2 parents 37f046e + 21345b4
commit d54dcfe
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)
  }