fix compile errors

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

View File

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

View File

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

View File

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