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
|
From: Shengjing Zhu <zhsj@debian.org>
Date: Fri, 19 Jun 2020 16:56:13 +0800
Subject: disable vpnkit
---
cmd/rootlesskit/main.go | 12 ++----------
pkg/network/vpnkit/vpnkit.go | 2 ++
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/cmd/rootlesskit/main.go b/cmd/rootlesskit/main.go
index c628b7c..76dc619 100644
--- a/cmd/rootlesskit/main.go
+++ b/cmd/rootlesskit/main.go
@@ -19,7 +19,6 @@ import (
"github.com/rootless-containers/rootlesskit/pkg/copyup/tmpfssymlink"
"github.com/rootless-containers/rootlesskit/pkg/network/lxcusernic"
"github.com/rootless-containers/rootlesskit/pkg/network/slirp4netns"
- "github.com/rootless-containers/rootlesskit/pkg/network/vpnkit"
"github.com/rootless-containers/rootlesskit/pkg/parent"
"github.com/rootless-containers/rootlesskit/pkg/port/builtin"
"github.com/rootless-containers/rootlesskit/pkg/port/portutil"
@@ -392,14 +391,7 @@ func createParentOpt(clicontext *cli.Context, pipeFDEnvKey, stateDirEnvKey, pare
return opt, err
}
case "vpnkit":
- if ipnet != nil {
- return opt, errors.New("custom cidr is supported only for --net=slirp4netns")
- }
- binary := clicontext.String("vpnkit-binary")
- if _, err := exec.LookPath(binary); err != nil {
- return opt, err
- }
- opt.NetworkDriver = vpnkit.NewParentDriver(binary, mtu, ifname, disableHostLoopback)
+ return opt, errors.New("not supported in this Debian package")
case "lxc-user-nic":
logrus.Warn("\"lxc-user-nic\" network driver is experimental")
if ipnet != nil {
@@ -498,7 +490,7 @@ func createChildOpt(clicontext *cli.Context, pipeFDEnvKey string, targetCmd []st
case "slirp4netns":
opt.NetworkDriver = slirp4netns.NewChildDriver()
case "vpnkit":
- opt.NetworkDriver = vpnkit.NewChildDriver()
+ return opt, errors.New("not supported in this Debian package")
case "lxc-user-nic":
opt.NetworkDriver = lxcusernic.NewChildDriver()
default:
diff --git a/pkg/network/vpnkit/vpnkit.go b/pkg/network/vpnkit/vpnkit.go
index 4db72aa..840d05d 100644
--- a/pkg/network/vpnkit/vpnkit.go
+++ b/pkg/network/vpnkit/vpnkit.go
@@ -1,3 +1,5 @@
+// +build ignore
+
package vpnkit
import (
|
