gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-02-27 17:42:57 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixing merge problems

Browse source
This commit is contained in:
afeiszli 2022-02-05 15:55:03 -05:00
commit d55b7de178
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
netclient/local/routes_linux.go
View file

@ -13,7 +13,7 @@ import (
func setRoute(iface string, addr *net.IPNet, address string) error { func setRoute(iface string, addr *net.IPNet, address string) error {
out, err := ncutils.RunCmd(fmt.Sprintf("ip route get %s", addr.IP.String()), false) out, err := ncutils.RunCmd(fmt.Sprintf("ip route get %s", addr.IP.String()), false)
if err != nil || !strings.Contains(out, iface) { if err != nil || !strings.Contains(out, iface) {
_, err = ncutils.RunCmd(fmt.Sprintf("ip route add %s dev %s", addr.String(), iface), true) _, err = ncutils.RunCmd(fmt.Sprintf("ip route add %s dev %s", addr.String(), iface), false)
} }
return err return err
} }

3
netclient/wireguard/unix.go
View file

@ -65,9 +65,6 @@ func ApplyWGQuickConf(confPath string, ifacename string) error {
ncutils.RunCmd("wg-quick down "+confPath, true) ncutils.RunCmd("wg-quick down "+confPath, true)
} }
_, err = ncutils.RunCmd("wg-quick up "+confPath, true) _, err = ncutils.RunCmd("wg-quick up "+confPath, true)
// if err != nil {
// return err
// }
return err return err
} }
} }