zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-04 16:33:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix_v0.2_portconflicts' of https://github.com/gravitl/netmaker into bugfix_v0.2_portconflicts

Browse Source
This commit is contained in:
afeiszli
2021-04-07 09:53:51 -04:00
parent 5c6ffdb929 8d434bd43c
commit a2e58b04f6
11 changed files with 328 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
netclient/functions/common.go
View File

@@ -73,9 +73,7 @@ func GetFreePort(rangestart int32) (int32, error){
return portno, err
}
func Install(accesskey string, password string, server string, group string, noauto bool, accesstoken string) error {
func Install(accesskey string, password string, server string, group string, noauto bool, accesstoken string, inputname string) error {
tserver := ""
tnetwork := ""
@@ -234,6 +232,9 @@ func Install(accesskey string, password string, server string, group string, noa
if nodecfg.Name != "" {
name = nodecfg.Name
}
if inputname != "" && inputname != "noname" {
name = inputname
}
fmt.Println(" Name: " + name)