gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-02-26 17:15:23 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix compile errors

Browse source
This commit is contained in:
Matthew R. Kasun 2022-02-08 22:31:17 -05:00
parent a545643172
commit 2f6439654a
3 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
netclient/command/commands.go
View file

@ -34,11 +34,8 @@ func Join(cfg config.ClientConfig, privateKey string) error {
if err != nil {
ncutils.PrintLog("error removing services: "+err.Error(), 1)
}
if ncutils.IsFreebsd() {
err = daemon.RemoveFreebsdDaemon()
}
if err != nil {
ncutils.PrintLog("error removing services: "+err.Error(), 1)
if ncutils.IsFreeBSD() {
daemon.RemoveFreebsdDaemon()
}
}
} else {

14
netclient/daemon/freebsd.go
View file

@ -4,12 +4,11 @@ import (
"fmt"
"log"
"path/filepath"
"os"
"github.com/gravitl/netmaker/netclient/ncutils"
)
const EXEC_DIR = "/sbin"
// SetupFreebsdDaemon -- sets up daemon for freebsd
func SetupFreebsdDaemon() error {
dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
@ -87,7 +86,7 @@ netclient_args="daemon"`
rcbytes := []byte(rcFile)
if !ncutils.FileExists("/etc/rc.d/netclient") {
err := os.Write("/etc/rc.d/netclient", rcbytes, 0744)
err := os.WriteFile("/etc/rc.d/netclient", rcbytes, 0744)
if err != nil {
return err
}
@ -101,13 +100,14 @@ netclient_args="daemon"`
return nil
}
}
return nil
}
func FreebsdDaemon(command string) {
_, _ := ncutils.RunCmd(fmt.Sprintf("service netclient %s", command), true)
_, _ = ncutils.RunCmd(fmt.Sprintf("service netclient %s", command), true)
}
func CleanUpFreebsd() {
func CleanupFreebsd() {
if err := os.RemoveAll(ncutils.GetNetclientPath()); err != nil {
ncutils.PrintLog("Removing netclient configs: "+err.Error(), 1)
}
@ -118,13 +118,13 @@ func CleanUpFreebsd() {
func RemoveFreebsdDaemon() {
if ncutils.FileExists("/etc/rc.d/netclient") {
err = os.Remove("/etc/rc.d/netclient")
err := os.Remove("/etc/rc.d/netclient")
if err != nil {
ncutils.Log("Error removing /etc/rc.d/netclient. Please investigate.")
}
}
if ncutils.FileExists("/etc/rc.conf.d/netclient") {
err = os.Remove("/etc/rc.conf.d/netclient")
err := os.Remove("/etc/rc.conf.d/netclient")
if err != nil {
ncutils.Log("Error removing /etc/rc.conf.d/netclient. Please investigate.")
}

4
netclient/functions/common.go
View file

@ -137,7 +137,7 @@ func Uninstall() error {
daemon.CleanupMac()
} else if ncutils.IsLinux() {
daemon.CleanupLinux()
} else if ncutils.IsFreebsd() {
} else if ncutils.IsFreeBSD() {
daemon.CleanupFreebsd()
} else if !ncutils.IsKernel() {
ncutils.PrintLog("manual cleanup required", 1)
@ -235,7 +235,7 @@ func RemoveLocalInstance(cfg *config.ClientConfig, networkName string) error {
// TODO: Remove job?
} else if ncutils.IsMac() {
//TODO: Delete mac daemon
} else if ncutils.IsFreebsd() {
} else if ncutils.IsFreeBSD() {
daemon.RemoveFreebsdDaemon()
} else {
daemon.RemoveSystemDServices()