gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-06 03:46:02 +08:00
Code Issues Projects Releases Packages Wiki Activity

starting userspace

Browse source
This commit is contained in:
afeiszli 2021-09-21 20:50:32 -04:00
parent 90c153c48f
commit b024e249c7
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
netclient/local/local.go
View file

@ -7,7 +7,7 @@ import (
"net" "net"
"runtime" "runtime"
"strings" "strings"
"os/exec"
"github.com/gravitl/netmaker/netclient/ncutils" "github.com/gravitl/netmaker/netclient/ncutils"
) )
@ -54,7 +54,9 @@ func SetIPForwardingMac() error {
func IsWGInstalled() bool { func IsWGInstalled() bool {
out, err := ncutils.RunCmd("wg help", true) out, err := ncutils.RunCmd("wg help", true)
if err != nil { if err != nil {
return false _, err1 := exec.LookPath("wireguard-go")
_, err2 := exec.LookPath("boringtun")
return err1 == nil || err2 == nil
} }
return strings.Contains(out, "Available subcommand") return strings.Contains(out, "Available subcommand")
} }

8
netclient/main.go
View file

@ -342,8 +342,12 @@ func main() {
_, err = exec.LookPath("wg") _, err = exec.LookPath("wg")
if err != nil { if err != nil {
log.Println(err) userspace := os.Getenv("WG_QUICK_USERSPACE_IMPLEMENTATION")
log.Fatal("WireGuard not installed. Please install WireGuard (wireguard-tools) and try again.") if userspace == "" {
log.Println(err)
log.Fatal("WireGuard not installed. Please install WireGuard (wireguard-tools) and try again.")
}
ncutils.PrintLog("Running with userspace wireguard: "+userspace, 0)
} }
} }
if !ncutils.IsKernel() { if !ncutils.IsKernel() {