Skip to content

Commit 53345de

Browse files
sjenningk8s-publishing-bot
authored andcommitted
UPSTREAM: revert: 6d2d90f: opencontainers/runc: 1683: Fix race against systemd
Origin-commit: 68ceb424d14cc0c84d55dc179ee349e6f6eab1c2
1 parent 8ca35c7 commit 53345de

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

libcontainer/cgroups/systemd/apply_systemd.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -295,13 +295,10 @@ func (m *Manager) Apply(pid int) error {
295295
}
296296
}
297297

298-
statusChan := make(chan string)
299-
if _, err := theConn.StartTransientUnit(unitName, "replace", properties, statusChan); err != nil && !isUnitExists(err) {
298+
if _, err := theConn.StartTransientUnit(unitName, "replace", properties, nil); err != nil && !isUnitExists(err) {
300299
return err
301300
}
302301

303-
<-statusChan
304-
305302
if err := joinCgroups(c, pid); err != nil {
306303
return err
307304
}

0 commit comments

Comments
 (0)