fixes and updates from merge for windows

This commit is contained in:
redanthrax 2022-06-27 14:12:07 -07:00
parent fd29dc04e3
commit cb250104fe
3 changed files with 9 additions and 9 deletions

View file

@ -801,7 +801,7 @@ func (a *Agent) RecoverMesh() {
}
func (a *Agent) getMeshNodeID() (string, error) {
out, err := CMD(a.MeshSystemEXE, []string{"-nodeid"}, 10, false)
out, err := CMD(a.MeshSystemBin, []string{"-nodeid"}, 10, false)
if err != nil {
a.Logger.Debugln(err)
return "", err
@ -843,11 +843,6 @@ func (a *Agent) InstallService() error {
return nil
}
s, err := service.New(a, a.ServiceConfig)
if err != nil {
return err
}
svc, err := service.New(a, a.ServiceConfig)
if err != nil {
return err