diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-04-22 22:56:08 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-04-22 22:56:08 +0000 |
| commit | f2f926c52614691d7116ef6863aa28c385675096 (patch) | |
| tree | 72a68b26a8208057adfb2146c912a773d7b31f21 /pkg/sentry/vfs | |
| parent | 44d3a97dc41e6bb6621774adf9701c2447709978 (diff) | |
| parent | d93907110eebdfb1e51dacd9ccffd0f0c2633a81 (diff) | |
Merge release-20210419.0-20-gd93907110 (automated)
Diffstat (limited to 'pkg/sentry/vfs')
| -rw-r--r-- | pkg/sentry/vfs/mount.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/sentry/vfs/mount.go b/pkg/sentry/vfs/mount.go index 7cdab6945..82fd382c2 100644 --- a/pkg/sentry/vfs/mount.go +++ b/pkg/sentry/vfs/mount.go @@ -826,6 +826,9 @@ func (vfs *VirtualFilesystem) GenerateProcMounts(ctx context.Context, taskRootDi if mnt.Flags.NoExec { opts += ",noexec" } + if mopts := mnt.fs.Impl().MountOptions(); mopts != "" { + opts += "," + mopts + } // Format: // <special device or remote filesystem> <mount point> <filesystem type> <mount options> <needs dump> <fsck order> |