Skip to content

Commit d36d371

Browse files
committed
Fix import paths
This modifies imports to reflect the move of github.com/opencontainers/runc/libcontainer/cgroups to github.com/opencontainers/cgroups Generated via find . -type f -name "*.go" -exec sed -i 's|github.com/opencontainers/runc/libcontainer/cgroups|github.com/opencontainers/cgroups|g' {} + Signed-off-by: Kir Kolyshkin <[email protected]>
1 parent b1c8cf4 commit d36d371

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+114
-114
lines changed

cgroups.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var (
1616

1717
// DevicesSetV1 and DevicesSetV2 are functions to set devices for
1818
// cgroup v1 and v2, respectively. Unless
19-
// [github.com/opencontainers/runc/libcontainer/cgroups/devices]
19+
// [github.com/opencontainers/cgroups/devices]
2020
// package is imported, it is set to nil, so cgroup managers can't
2121
// manage devices.
2222
DevicesSetV1 func(path string, r *Resources) error

config_linux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package cgroups
22

33
import (
44
systemdDbus "github.com/coreos/go-systemd/v22/dbus"
5-
devices "github.com/opencontainers/runc/libcontainer/cgroups/devices/config"
5+
devices "github.com/opencontainers/cgroups/devices/config"
66
)
77

88
type FreezerState string

devices/devicefilter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"strconv"
1414

1515
"github.com/cilium/ebpf/asm"
16-
devices "github.com/opencontainers/runc/libcontainer/cgroups/devices/config"
16+
devices "github.com/opencontainers/cgroups/devices/config"
1717
"golang.org/x/sys/unix"
1818
)
1919

devices/devicefilter_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"strings"
55
"testing"
66

7-
devices "github.com/opencontainers/runc/libcontainer/cgroups/devices/config"
7+
devices "github.com/opencontainers/cgroups/devices/config"
88
)
99

1010
func hash(s, comm string) string {

devices/devices.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
package devices
66

77
import (
8-
"github.com/opencontainers/runc/libcontainer/cgroups"
9-
"github.com/opencontainers/runc/libcontainer/cgroups/systemd"
8+
"github.com/opencontainers/cgroups"
9+
"github.com/opencontainers/cgroups/systemd"
1010
)
1111

1212
func init() {

devices/devices_emulator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"strconv"
2727
"strings"
2828

29-
devices "github.com/opencontainers/runc/libcontainer/cgroups/devices/config"
29+
devices "github.com/opencontainers/cgroups/devices/config"
3030
)
3131

3232
// deviceMeta is a Rule without the Allow or Permissions fields, and no

devices/devices_emulator_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"strings"
2626
"testing"
2727

28-
devices "github.com/opencontainers/runc/libcontainer/cgroups/devices/config"
28+
devices "github.com/opencontainers/cgroups/devices/config"
2929
)
3030

3131
func TestDeviceEmulatorLoad(t *testing.T) {

devices/systemd.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"github.com/godbus/dbus/v5"
1212
"github.com/sirupsen/logrus"
1313

14-
"github.com/opencontainers/runc/libcontainer/cgroups"
15-
devices "github.com/opencontainers/runc/libcontainer/cgroups/devices/config"
14+
"github.com/opencontainers/cgroups"
15+
devices "github.com/opencontainers/cgroups/devices/config"
1616
)
1717

1818
// systemdProperties takes the configured device rules and generates a

devices/systemd_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"strings"
99
"testing"
1010

11-
"github.com/opencontainers/runc/libcontainer/cgroups"
12-
devices "github.com/opencontainers/runc/libcontainer/cgroups/devices/config"
13-
"github.com/opencontainers/runc/libcontainer/cgroups/systemd"
11+
"github.com/opencontainers/cgroups"
12+
devices "github.com/opencontainers/cgroups/devices/config"
13+
"github.com/opencontainers/cgroups/systemd"
1414
)
1515

1616
// TestPodSkipDevicesUpdate checks that updating a pod having SkipDevices: true

devices/v1.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"reflect"
77

88
"github.com/moby/sys/userns"
9-
"github.com/opencontainers/runc/libcontainer/cgroups"
10-
devices "github.com/opencontainers/runc/libcontainer/cgroups/devices/config"
9+
"github.com/opencontainers/cgroups"
10+
devices "github.com/opencontainers/cgroups/devices/config"
1111
)
1212

1313
var testingSkipFinalCheck bool

0 commit comments

Comments
 (0)