opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 12:20:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1467 from rhatdan/dev

Browse Source 
Don't mount /dev/* if user mounted /dev
This commit is contained in:
Matthew Heon
2018-09-14 17:26:38 -04:00
committed by GitHub
parent 8b21e2ecf5 31294799c4
commit 5622de9c61
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/spec/spec.go
View File

@ -318,8 +318,18 @@ func CreateConfigToOCISpec(config *CreateConfig) (*spec.Spec, error) { //nolint
for _, mount := range mounts { for _, mount := range mounts {
destinations[path.Clean(mount.Destination)] = true destinations[path.Clean(mount.Destination)] = true
} }
// Copy all mounts from spec to defaultMounts, except for
// - mounts overridden by a user supplied mount;
// - all mounts under /dev if a user supplied /dev is present;
mountDev := destinations["/dev"]
for _, mount := range configSpec.Mounts { for _, mount := range configSpec.Mounts {
if _, ok := destinations[path.Clean(mount.Destination)]; !ok { if _, ok := destinations[path.Clean(mount.Destination)]; !ok {
if mountDev && strings.HasPrefix(mount.Destination, "/dev/") {
// filter out everything under /dev if /dev is user-mounted
continue
}
logrus.Debugf("Adding mount %s", mount.Destination) logrus.Debugf("Adding mount %s", mount.Destination)
mounts = append(mounts, mount) mounts = append(mounts, mount)
} }