Merge branch 'develop' of https://github.com/gravitl/netmaker into bugfixes_v0.10.0_various2

This commit is contained in:
afeiszli 2022-02-05 14:33:37 -05:00
commit d3a4b5ad8e

View file

@ -177,8 +177,8 @@ func InitWireguard(node *models.Node, privkey string, peers []wgtypes.PeerConfig
ncutils.PrintLog("waiting for interface...", 1) // ensure interface is created
output, _ := ncutils.RunCmd("wg", false)
starttime := time.Now()
ifaceReady := false
for !strings.Contains(output, ifacename) && !(time.Now().After(starttime.Add(time.Second << 4))) {
ifaceReady := !strings.Contains(output, ifacename)
for !ifaceReady && !(time.Now().After(starttime.Add(time.Second << 4))) {
output, _ = ncutils.RunCmd("wg", false)
err = ApplyConf(node, ifacename, confPath)
time.Sleep(time.Second)