mirror of
https://github.com/gravitl/netmaker.git
synced 2025-02-27 17:42:57 +08:00
fixing merge problems
This commit is contained in:
commit
d55b7de178
2 changed files with 1 additions and 4 deletions
|
@ -13,7 +13,7 @@ import (
|
|||
func setRoute(iface string, addr *net.IPNet, address string) error {
|
||||
out, err := ncutils.RunCmd(fmt.Sprintf("ip route get %s", addr.IP.String()), false)
|
||||
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
|
||||
}
|
||||
|
|
|
@ -65,9 +65,6 @@ func ApplyWGQuickConf(confPath string, ifacename string) error {
|
|||
ncutils.RunCmd("wg-quick down "+confPath, true)
|
||||
}
|
||||
_, err = ncutils.RunCmd("wg-quick up "+confPath, true)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue