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
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
|
From: Mathias Gibbens <gibmat@debian.org>
Description: Adjust import paths to reflect Debian packaging
Forwarded: not-needed
diff --git a/lxc-to-lxd/main_migrate.go b/lxc-to-lxd/main_migrate.go
index 957ef8180..95a264e8f 100644
--- a/lxc-to-lxd/main_migrate.go
+++ b/lxc-to-lxd/main_migrate.go
@@ -8,7 +8,7 @@ import (
"strconv"
"strings"
- liblxc "github.com/lxc/go-lxc"
+ liblxc "gopkg.in/lxc/go-lxc.v2"
"github.com/spf13/cobra"
"github.com/canonical/lxd/client"
diff --git a/lxc-to-lxd/main_migrate_test.go b/lxc-to-lxd/main_migrate_test.go
index adda1096d..65345e6d6 100644
--- a/lxc-to-lxd/main_migrate_test.go
+++ b/lxc-to-lxd/main_migrate_test.go
@@ -6,7 +6,7 @@ import (
"strings"
"testing"
- liblxc "github.com/lxc/go-lxc"
+ liblxc "gopkg.in/lxc/go-lxc.v2"
"github.com/stretchr/testify/require"
)
diff --git a/lxc-to-lxd/network.go b/lxc-to-lxd/network.go
index 1d0752de5..320ea1852 100644
--- a/lxc-to-lxd/network.go
+++ b/lxc-to-lxd/network.go
@@ -4,7 +4,7 @@ import (
"fmt"
"strings"
- liblxc "github.com/lxc/go-lxc"
+ liblxc "gopkg.in/lxc/go-lxc.v2"
)
func networkGet(container *liblxc.Container, index int, configKey string) map[string]string {
diff --git a/lxd/daemon.go b/lxd/daemon.go
index 6fa08b4d0..aa764d7f8 100644
--- a/lxd/daemon.go
+++ b/lxd/daemon.go
@@ -22,7 +22,7 @@ import (
"github.com/canonical/go-dqlite/driver"
"github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery"
"github.com/gorilla/mux"
- liblxc "github.com/lxc/go-lxc"
+ liblxc "gopkg.in/lxc/go-lxc.v2"
"golang.org/x/sys/unix"
"github.com/canonical/lxd/lxd/apparmor"
diff --git a/lxd/device/proxy.go b/lxd/device/proxy.go
index de5a1f618..62e4753c9 100644
--- a/lxd/device/proxy.go
+++ b/lxd/device/proxy.go
@@ -11,7 +11,7 @@ import (
"strings"
"time"
- liblxc "github.com/lxc/go-lxc"
+ liblxc "gopkg.in/lxc/go-lxc.v2"
"github.com/canonical/lxd/lxd/apparmor"
"github.com/canonical/lxd/lxd/db"
diff --git a/lxd/instance/drivers/driver_lxc.go b/lxd/instance/drivers/driver_lxc.go
index 8d0d39fb5..26b0fef38 100644
--- a/lxd/instance/drivers/driver_lxc.go
+++ b/lxd/instance/drivers/driver_lxc.go
@@ -26,7 +26,7 @@ import (
"github.com/checkpoint-restore/go-criu/v6/crit"
"github.com/flosch/pongo2"
"github.com/gorilla/websocket"
- liblxc "github.com/lxc/go-lxc"
+ liblxc "gopkg.in/lxc/go-lxc.v2"
"github.com/pborman/uuid"
"github.com/pkg/sftp"
"golang.org/x/sync/errgroup"
diff --git a/lxd/instance/instance_interface.go b/lxd/instance/instance_interface.go
index 61704917b..bb900766e 100644
--- a/lxd/instance/instance_interface.go
+++ b/lxd/instance/instance_interface.go
@@ -8,7 +8,7 @@ import (
"os"
"time"
- liblxc "github.com/lxc/go-lxc"
+ liblxc "gopkg.in/lxc/go-lxc.v2"
"github.com/pkg/sftp"
"google.golang.org/protobuf/proto"
diff --git a/lxd/instance/instance_utils.go b/lxd/instance/instance_utils.go
index 343ca72dc..7f56bd49e 100644
--- a/lxd/instance/instance_utils.go
+++ b/lxd/instance/instance_utils.go
@@ -15,7 +15,7 @@ import (
"time"
"github.com/flosch/pongo2"
- liblxc "github.com/lxc/go-lxc"
+ liblxc "gopkg.in/lxc/go-lxc.v2"
"github.com/pborman/uuid"
"github.com/canonical/lxd/client"
diff --git a/lxd/instance_console.go b/lxd/instance_console.go
index f5e47197e..e73c71ea9 100644
--- a/lxd/instance_console.go
+++ b/lxd/instance_console.go
@@ -14,7 +14,7 @@ import (
"github.com/gorilla/mux"
"github.com/gorilla/websocket"
- liblxc "github.com/lxc/go-lxc"
+ liblxc "gopkg.in/lxc/go-lxc.v2"
"golang.org/x/sys/unix"
"github.com/canonical/lxd/lxd/cluster"
diff --git a/lxd/main_forkconsole.go b/lxd/main_forkconsole.go
index 03895009a..a3a460d3b 100644
--- a/lxd/main_forkconsole.go
+++ b/lxd/main_forkconsole.go
@@ -6,7 +6,7 @@ import (
"strconv"
"strings"
- liblxc "github.com/lxc/go-lxc"
+ liblxc "gopkg.in/lxc/go-lxc.v2"
"github.com/spf13/cobra"
)
diff --git a/lxd/main_forkmigrate.go b/lxd/main_forkmigrate.go
index 1f0ee6cba..79d999571 100644
--- a/lxd/main_forkmigrate.go
+++ b/lxd/main_forkmigrate.go
@@ -5,7 +5,7 @@ import (
"os"
"strconv"
- liblxc "github.com/lxc/go-lxc"
+ liblxc "gopkg.in/lxc/go-lxc.v2"
"github.com/spf13/cobra"
)
diff --git a/lxd/main_forkstart.go b/lxd/main_forkstart.go
index 649671bf5..4f2a1b5e0 100644
--- a/lxd/main_forkstart.go
+++ b/lxd/main_forkstart.go
@@ -4,7 +4,7 @@ import (
"fmt"
"os"
- liblxc "github.com/lxc/go-lxc"
+ liblxc "gopkg.in/lxc/go-lxc.v2"
"github.com/spf13/cobra"
"golang.org/x/sys/unix"
diff --git a/lxd/seccomp/seccomp.go b/lxd/seccomp/seccomp.go
index a285cb509..10270fa59 100644
--- a/lxd/seccomp/seccomp.go
+++ b/lxd/seccomp/seccomp.go
@@ -451,7 +451,7 @@ import (
"strings"
"unsafe"
- liblxc "github.com/lxc/go-lxc"
+ liblxc "gopkg.in/lxc/go-lxc.v2"
"golang.org/x/sys/unix"
deviceConfig "github.com/canonical/lxd/lxd/device/config"
|
