1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
From: Reinhard Tartler <siretart@x1.int.tauware.de>
Date: Sat, 6 Sep 2025 21:46:02 -0400
Subject: Revert "update github.com/opencontainers/runc to v1.3.0"
This reverts commit 4533ebe282c5c3617feec5299def093eaf7e7351.
---
go.mod | 2 +-
go.sum | 4 ++--
pkg/parse/parse_unix.go | 9 ++++-----
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/go.mod b/go.mod
index 7a1ff0c..bc1932a 100644
--- a/go.mod
+++ b/go.mod
@@ -31,7 +31,7 @@ require (
github.com/opencontainers/cgroups v0.0.4
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.1.1
- github.com/opencontainers/runc v1.3.0
+ github.com/opencontainers/runc v1.2.6
github.com/opencontainers/runtime-spec v1.2.1
github.com/opencontainers/runtime-tools v0.9.1-0.20250523060157-0ea5ed0382a2
github.com/opencontainers/selinux v1.12.0
diff --git a/go.sum b/go.sum
index ff7a777..9194a58 100644
--- a/go.sum
+++ b/go.sum
@@ -229,8 +229,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
-github.com/opencontainers/runc v1.3.0 h1:cvP7xbEvD0QQAs0nZKLzkVog2OPZhI/V2w3WmTmUSXI=
-github.com/opencontainers/runc v1.3.0/go.mod h1:9wbWt42gV+KRxKRVVugNP6D5+PQciRbenB4fLVsqGPs=
+github.com/opencontainers/runc v1.2.6 h1:P7Hqg40bsMvQGCS4S7DJYhUZOISMLJOB2iGX5COWiPk=
+github.com/opencontainers/runc v1.2.6/go.mod h1:dOQeFo29xZKBNeRBI0B19mJtfHv68YgCTh1X+YphA+4=
github.com/opencontainers/runtime-spec v1.2.1 h1:S4k4ryNgEpxW1dzyqffOmhI1BHYcjzU8lpJfSlR0xww=
github.com/opencontainers/runtime-spec v1.2.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/opencontainers/runtime-tools v0.9.1-0.20250523060157-0ea5ed0382a2 h1:2xZEHOdeQBV6PW8ZtimN863bIOl7OCW/X10K0cnxKeA=
diff --git a/pkg/parse/parse_unix.go b/pkg/parse/parse_unix.go
index 0e96a0d..3e4e1d1 100644
--- a/pkg/parse/parse_unix.go
+++ b/pkg/parse/parse_unix.go
@@ -8,11 +8,10 @@ import (
"path/filepath"
"github.com/containers/storage/pkg/unshare"
- "github.com/opencontainers/cgroups/devices/config"
"github.com/opencontainers/runc/libcontainer/devices"
)
-func DeviceFromPath(device string) ([]config.Device, error) {
+func DeviceFromPath(device string) ([]devices.Device, error) {
src, dst, permissions, err := Device(device)
if err != nil {
return nil, err
@@ -26,7 +25,7 @@ func DeviceFromPath(device string) ([]config.Device, error) {
}
if !srcInfo.IsDir() {
- devs := make([]config.Device, 0, 1)
+ devs := make([]devices.Device, 0, 1)
dev, err := devices.DeviceFromPath(src, permissions)
if err != nil {
return nil, fmt.Errorf("%s is not a valid device: %w", src, err)
@@ -41,10 +40,10 @@ func DeviceFromPath(device string) ([]config.Device, error) {
if err != nil {
return nil, fmt.Errorf("getting source devices from directory %s: %w", src, err)
}
- devs := make([]config.Device, 0, len(srcDevices))
+ devs := make([]devices.Device, 0, len(srcDevices))
for _, d := range srcDevices {
d.Path = filepath.Join(dst, filepath.Base(d.Path))
- d.Permissions = config.Permissions(permissions)
+ d.Permissions = devices.Permissions(permissions)
devs = append(devs, *d)
}
return devs, nil
|
