gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2024-09-21 07:46:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

set macaddress and nodeid if not set

Browse source
This commit is contained in:
Matthew R. Kasun 2022-02-14 14:13:18 -05:00
parent fbc8182f33
commit 16cf0eaeed
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
netclient/functions/join.go
View file

@ -103,7 +103,8 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string) error {
if cfg.Node.MacAddress == "" {
macs, err := ncutils.GetMacAddr()
if err != nil {
return err
//if macaddress can't be found set to random string
cfg.Node.MacAddress = ncutils.MakeRandomString(18)
} else {
cfg.Node.MacAddress = macs[0]
}

7
servercfg/serverconf.go
View file

@ -10,6 +10,7 @@ import (
"strings"
"github.com/gravitl/netmaker/config"
"github.com/gravitl/netmaker/netclient/ncutils"
)
var Version = "dev"
@ -545,7 +546,11 @@ func GetNodeID() string {
if os.Getenv("NODE_ID") != "" {
id = os.Getenv("NODE_ID")
} else if config.Config.Server.NodeID != "" {
id = config.Config.Server.NodeID
id, err := os.Hostname()
if err != nil {
id = ncutils.MakeRandomString(10)
}
config.Config.Server.NodeID = id
}
return id
}