diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-07-09 01:00:35 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-07-09 01:00:35 +0000 |
| commit | 673a86a67ecf6bc6b2881fd6ff3456b51e6b00ef (patch) | |
| tree | f663f359e9a24f55ffdbec64af7240c82bf1c89c /runsc/cmd | |
| parent | e4b190da475b0bc6a50229f30cb837116462c929 (diff) | |
| parent | f8207a823351055a2aaad633b428fe7c1f0585f0 (diff) | |
Merge release-20210628.0-32-gf8207a823 (automated)
Diffstat (limited to 'runsc/cmd')
| -rw-r--r-- | runsc/cmd/chroot.go | 2 | ||||
| -rw-r--r-- | runsc/cmd/gofer.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/runsc/cmd/chroot.go b/runsc/cmd/chroot.go index 791a50135..7b11b3367 100644 --- a/runsc/cmd/chroot.go +++ b/runsc/cmd/chroot.go @@ -30,7 +30,7 @@ func mountInChroot(chroot, src, dst, typ string, flags uint32) error { chrootDst := filepath.Join(chroot, dst) log.Infof("Mounting %q at %q", src, chrootDst) - if err := specutils.Mount(src, chrootDst, typ, flags, "/proc"); err != nil { + if err := specutils.SafeSetupAndMount(src, chrootDst, typ, flags, "/proc"); err != nil { return fmt.Errorf("error mounting %q at %q: %v", src, chrootDst, err) } return nil diff --git a/runsc/cmd/gofer.go b/runsc/cmd/gofer.go index 570df407c..f5eabce74 100644 --- a/runsc/cmd/gofer.go +++ b/runsc/cmd/gofer.go @@ -368,7 +368,7 @@ func setupMounts(conf *config.Config, mounts []specs.Mount, root, procPath strin } log.Infof("Mounting src: %q, dst: %q, flags: %#x", m.Source, dst, flags) - if err := specutils.Mount(m.Source, dst, m.Type, flags, procPath); err != nil { + if err := specutils.SafeSetupAndMount(m.Source, dst, m.Type, flags, procPath); err != nil { return fmt.Errorf("mounting %+v: %v", m, err) } |