dilim/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-06-30 19:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1683 from vikaschoudhary16/runc-systemd-race

Browse Source 
Fix race against systemd
This commit is contained in:
Qiang Huang
2018-01-09 09:30:58 +08:00
committed by GitHub
parent e6516b3d5d d5b4a3eddb
commit 96086e56f5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libcontainer/cgroups/systemd/apply_systemd.go
View File

@@ -295,10 +295,13 @@ func (m *Manager) Apply(pid int) error {
}
}
if _, err := theConn.StartTransientUnit(unitName, "replace", properties, nil); err != nil && !isUnitExists(err) {
statusChan := make(chan string)
if _, err := theConn.StartTransientUnit(unitName, "replace", properties, statusChan); err != nil && !isUnitExists(err) {
return err
}
<-statusChan
if err := joinCgroups(c, pid); err != nil {
return err
}