Skip to content

Commit d36d371

Browse files
kolyshkinkolyshkin
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+2-2
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

+1-1
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

+1-1
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

+2-2
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

+3-3
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

+2-2
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

‎devices/v1_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77

88
"github.com/moby/sys/userns"
99

10-
"github.com/opencontainers/runc/libcontainer/cgroups"
11-
devices "github.com/opencontainers/runc/libcontainer/cgroups/devices/config"
12-
"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
10+
"github.com/opencontainers/cgroups"
11+
devices "github.com/opencontainers/cgroups/devices/config"
12+
"github.com/opencontainers/cgroups/fscommon"
1313
)
1414

1515
func init() {

‎devices/v2.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"github.com/moby/sys/userns"
77
"golang.org/x/sys/unix"
88

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
func isRWM(perms devices.Permissions) bool {

‎fs/blkio.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strconv"
88
"strings"
99

10-
"github.com/opencontainers/runc/libcontainer/cgroups"
10+
"github.com/opencontainers/cgroups"
1111
)
1212

1313
type BlkioGroup struct {

‎fs/blkio_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"strconv"
55
"testing"
66

7-
"github.com/opencontainers/runc/libcontainer/cgroups"
8-
"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
7+
"github.com/opencontainers/cgroups"
8+
"github.com/opencontainers/cgroups/fscommon"
99
)
1010

1111
const (

‎fs/cpu.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"os"
88
"strconv"
99

10-
"github.com/opencontainers/runc/libcontainer/cgroups"
11-
"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
10+
"github.com/opencontainers/cgroups"
11+
"github.com/opencontainers/cgroups/fscommon"
1212
"golang.org/x/sys/unix"
1313
)
1414

‎fs/cpu_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"strconv"
66
"testing"
77

8-
"github.com/opencontainers/runc/libcontainer/cgroups"
9-
"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
8+
"github.com/opencontainers/cgroups"
9+
"github.com/opencontainers/cgroups/fscommon"
1010
)
1111

1212
func TestCpuSetShares(t *testing.T) {

‎fs/cpuacct.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"strconv"
77
"strings"
88

9-
"github.com/opencontainers/runc/libcontainer/cgroups"
10-
"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
9+
"github.com/opencontainers/cgroups"
10+
"github.com/opencontainers/cgroups/fscommon"
1111
)
1212

1313
const (

‎fs/cpuacct_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"reflect"
55
"testing"
66

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

1010
const (

‎fs/cpuset.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
"golang.org/x/sys/unix"
1212

13-
"github.com/opencontainers/runc/libcontainer/cgroups"
14-
"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
13+
"github.com/opencontainers/cgroups"
14+
"github.com/opencontainers/cgroups/fscommon"
1515
)
1616

1717
var (

‎fs/cpuset_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"reflect"
55
"testing"
66

7-
"github.com/opencontainers/runc/libcontainer/cgroups"
8-
"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
7+
"github.com/opencontainers/cgroups"
8+
"github.com/opencontainers/cgroups/fscommon"
99
)
1010

1111
const (

‎fs/devices.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package fs
22

33
import (
4-
"github.com/opencontainers/runc/libcontainer/cgroups"
4+
"github.com/opencontainers/cgroups"
55
)
66

77
type DevicesGroup struct{}

‎fs/error.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package fs
33
import (
44
"fmt"
55

6-
"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
6+
"github.com/opencontainers/cgroups/fscommon"
77
)
88

99
type parseError = fscommon.ParseError

‎fs/freezer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strings"
88
"time"
99

10-
"github.com/opencontainers/runc/libcontainer/cgroups"
10+
"github.com/opencontainers/cgroups"
1111
"github.com/sirupsen/logrus"
1212
"golang.org/x/sys/unix"
1313
)

‎fs/freezer_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package fs
33
import (
44
"testing"
55

6-
"github.com/opencontainers/runc/libcontainer/cgroups"
7-
"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
6+
"github.com/opencontainers/cgroups"
7+
"github.com/opencontainers/cgroups/fscommon"
88
)
99

1010
func TestFreezerSetState(t *testing.T) {

‎fs/fs.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88

99
"golang.org/x/sys/unix"
1010

11-
"github.com/opencontainers/runc/libcontainer/cgroups"
12-
"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
11+
"github.com/opencontainers/cgroups"
12+
"github.com/opencontainers/cgroups/fscommon"
1313
)
1414

1515
var subsystems = []subsystem{

‎fs/fs_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package fs
33
import (
44
"testing"
55

6-
"github.com/opencontainers/runc/libcontainer/cgroups"
6+
"github.com/opencontainers/cgroups"
77
)
88

99
func BenchmarkGetStats(b *testing.B) {

‎fs/hugetlb.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"os"
66
"strconv"
77

8-
"github.com/opencontainers/runc/libcontainer/cgroups"
9-
"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
8+
"github.com/opencontainers/cgroups"
9+
"github.com/opencontainers/cgroups/fscommon"
1010
)
1111

1212
type HugetlbGroup struct{}

‎fs/hugetlb_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"strconv"
66
"testing"
77

8-
"github.com/opencontainers/runc/libcontainer/cgroups"
9-
"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
8+
"github.com/opencontainers/cgroups"
9+
"github.com/opencontainers/cgroups/fscommon"
1010
)
1111

1212
const (

‎fs/memory.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212

1313
"golang.org/x/sys/unix"
1414

15-
"github.com/opencontainers/runc/libcontainer/cgroups"
16-
"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
15+
"github.com/opencontainers/cgroups"
16+
"github.com/opencontainers/cgroups/fscommon"
1717
)
1818

1919
const (

‎fs/memory_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"strconv"
55
"testing"
66

7-
"github.com/opencontainers/runc/libcontainer/cgroups"
8-
"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
7+
"github.com/opencontainers/cgroups"
8+
"github.com/opencontainers/cgroups/fscommon"
99
)
1010

1111
const (

‎fs/name.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package fs
22

33
import (
4-
"github.com/opencontainers/runc/libcontainer/cgroups"
4+
"github.com/opencontainers/cgroups"
55
)
66

77
type NameGroup struct {

‎fs/net_cls.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package fs
33
import (
44
"strconv"
55

6-
"github.com/opencontainers/runc/libcontainer/cgroups"
6+
"github.com/opencontainers/cgroups"
77
)
88

99
type NetClsGroup struct{}

‎fs/net_cls_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"strconv"
55
"testing"
66

7-
"github.com/opencontainers/runc/libcontainer/cgroups"
8-
"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
7+
"github.com/opencontainers/cgroups"
8+
"github.com/opencontainers/cgroups/fscommon"
99
)
1010

1111
const (

‎fs/net_prio.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package fs
22

33
import (
4-
"github.com/opencontainers/runc/libcontainer/cgroups"
4+
"github.com/opencontainers/cgroups"
55
)
66

77
type NetPrioGroup struct{}

‎fs/net_prio_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"strings"
55
"testing"
66

7-
"github.com/opencontainers/runc/libcontainer/cgroups"
8-
"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
7+
"github.com/opencontainers/cgroups"
8+
"github.com/opencontainers/cgroups/fscommon"
99
)
1010

1111
var prioMap = []*cgroups.IfPrioMap{

‎fs/paths.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88

99
"golang.org/x/sys/unix"
1010

11-
"github.com/opencontainers/runc/libcontainer/cgroups"
12-
"github.com/opencontainers/runc/libcontainer/cgroups/internal/path"
11+
"github.com/opencontainers/cgroups"
12+
"github.com/opencontainers/cgroups/internal/path"
1313
)
1414

1515
// The absolute path to the root of the cgroup hierarchies.

‎fs/paths_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"strings"
66
"testing"
77

8-
"github.com/opencontainers/runc/libcontainer/cgroups"
9-
"github.com/opencontainers/runc/libcontainer/cgroups/internal/path"
8+
"github.com/opencontainers/cgroups"
9+
"github.com/opencontainers/cgroups/internal/path"
1010
)
1111

1212
func TestInvalidCgroupPath(t *testing.T) {

‎fs/perf_event.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package fs
22

33
import (
4-
"github.com/opencontainers/runc/libcontainer/cgroups"
4+
"github.com/opencontainers/cgroups"
55
)
66

77
type PerfEventGroup struct{}

0 commit comments

Comments
 (0)