mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3620 from lab47/b-remove-udev-dep

Browse Source 
[1.1] Fixes inability to use /dev/null when inside a container
This commit is contained in:
Kir Kolyshkin
2022-10-20 19:42:30 -07:00
committed by GitHub
parent 28fa513ebd 3b9582895b
commit 974efd2dfc
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcontainer/cgroups/systemd/common.go
+12 -2
View File
@@ -293,8 +293,18 @@ func generateDeviceProperties(r *configs.Resources) ([]systemdDbus.Property, err
// rules separately to systemd) we can safely skip entries that don't
// have a corresponding path.
if _, err := os.Stat(entry.Path); err != nil {
logrus.Debugf("skipping device %s for systemd: %s", entry.Path, err)
continue
// Also check /sys/dev so that we don't depend on /dev/{block,char}
// being populated. (/dev/{block,char} is populated by udev, which
// isn't strictly required for systemd). Ironically, this happens most
// easily when starting containerd within a runc created container
// itself.
// We don't bother with securejoin here because we create entry.Path
// right above here, so we know it's safe.
if _, err := os.Stat("/sys" + entry.Path); err != nil {
logrus.Warnf("skipping device %s for systemd: %s", entry.Path, err)
continue
}
}
}
deviceAllowList = append(deviceAllowList, entry)