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

removed server check in join

Browse Source
This commit is contained in:
0xdcarns
2021-10-20 10:20:19 -04:00
parent 950fc6970d
commit e726d02206
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
netclient/command/commands.go
View File

@@ -27,9 +27,6 @@ func Join(cfg config.ClientConfig, privateKey string) error {
var err error var err error
err = functions.JoinNetwork(cfg, privateKey) err = functions.JoinNetwork(cfg, privateKey)
if err != nil && cfg.Node.IsServer != "yes" { // make sure server side is cleaned up
return err
}
if err != nil && !cfg.DebugJoin { if err != nil && !cfg.DebugJoin {
if !strings.Contains(err.Error(), "ALREADY_INSTALLED") { if !strings.Contains(err.Error(), "ALREADY_INSTALLED") {
ncutils.PrintLog("error installing: "+err.Error(), 1) ncutils.PrintLog("error installing: "+err.Error(), 1)

25
netclient/daemon/systemd.go
View File

@@ -112,16 +112,23 @@ func RemoveSystemDServices() error {
if err != nil { if err != nil {
log.Println(err) log.Println(err)
} }
_, err = ncutils.RunCmd("systemctl disable netclient.service", true) ncutils.RunCmd("systemctl disable netclient.service", false)
_, err = ncutils.RunCmd("systemctl disable netclient.timer", true) ncutils.RunCmd("systemctl disable netclient.timer", false)
err = os.Remove("/etc/systemd/system/netclient.service") if ncutils.FileExists("/etc/systemd/system/netclient.service") {
err = os.Remove("/etc/systemd/system/netclient.timer") err = os.Remove("/etc/systemd/system/netclient.service")
if err != nil { if err != nil {
log.Println("Error removing file. Please investigate.") ncutils.Log("Error removing /etc/systemd/system/netclient.service. Please investigate.")
log.Println(err) }
} }
_, _ = ncutils.RunCmd("systemctl daemon-reload", true) if ncutils.FileExists("/etc/systemd/system/netclient.timer") {
_, _ = ncutils.RunCmd("systemctl reset-failed", true) err = os.Remove("/etc/systemd/system/netclient.timer")
if err != nil {
ncutils.Log("Error removing /etc/systemd/system/netclient.timer. Please investigate.")
}
}
ncutils.RunCmd("systemctl daemon-reload", false)
ncutils.RunCmd("systemctl reset-failed", false)
ncutils.Log("removed systemd remnants if any existed")
} }
return nil return nil
} }