Add compatibility patch for latest runc
This commit is contained in:
parent
a7673f8fc0
commit
87f8204225
|
@ -0,0 +1,33 @@
|
|||
From 788f2f928c1d0099d3861553bf82e83169811a29 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
|
||||
Date: Tue, 1 Nov 2022 22:09:38 +0100
|
||||
Subject: [PATCH] Add reaper StartLocked
|
||||
|
||||
---
|
||||
sys/reaper/reaper_unix.go | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/sys/reaper/reaper_unix.go b/sys/reaper/reaper_unix.go
|
||||
index 6c4f13b90..a6d6a1e77 100644
|
||||
--- a/sys/reaper/reaper_unix.go
|
||||
+++ b/sys/reaper/reaper_unix.go
|
||||
@@ -101,6 +101,16 @@ func (m *Monitor) Start(c *exec.Cmd) (chan runc.Exit, error) {
|
||||
return ec, nil
|
||||
}
|
||||
|
||||
+// StartLocked starts the command a registers the process with the reaper
|
||||
+func (m *Monitor) StartLocked(c *exec.Cmd) (chan runc.Exit, error) {
|
||||
+ ec := m.Subscribe()
|
||||
+ if err := c.Start(); err != nil {
|
||||
+ m.Unsubscribe(ec)
|
||||
+ return nil, err
|
||||
+ }
|
||||
+ return ec, nil
|
||||
+}
|
||||
+
|
||||
// Wait blocks until a process is signal as dead.
|
||||
// User should rely on the value of the exit status to determine if the
|
||||
// command was successful or not.
|
||||
--
|
||||
2.38.1
|
||||
|
|
@ -38,6 +38,8 @@ Patch0: 0001-Revert-commit-for-Windows-metrics.patch
|
|||
Patch1: 0002-Remove-windows-only-dep.patch
|
||||
# Backport for github.com/containerd/typeurl update
|
||||
Patch2: 0001-Use-typeurl.Any-instead-of-github.com-gogo-protobuf-.patch
|
||||
# To use with latest go-runc
|
||||
Patch3: 0001-Add-reaper-StartLocked.patch
|
||||
|
||||
BuildRequires: btrfs-progs-devel
|
||||
BuildRequires: go-md2man
|
||||
|
|
Loading…
Reference in New Issue