sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-18 08:16:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update go version (#603)

Browse Source 
Removed ioctl code and remove exception from lint action
This commit is contained in:
Maycon Santos
2022-12-04 13:22:21 +01:00
committed by GitHub
parent d029136d3d
commit d2d5d4b4b9
14 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
iface/module_linux.go
View File

@@ -8,8 +8,8 @@ import (
log "github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
"golang.org/x/sys/unix"
"io"
"io/fs"
"io/ioutil"
"math"
"os"
"path/filepath"
@@ -295,7 +295,7 @@ func loadModule(name, path string) error {
// first try finit_module(2), then init_module(2)
err = unix.FinitModule(int(f.Fd()), "", 0)
if errors.Is(err, unix.ENOSYS) {
buf, err := ioutil.ReadAll(f)
buf, err := io.ReadAll(f)
if err != nil {
return err
}

3
iface/module_linux_test.go
View File

@@ -6,7 +6,6 @@ import (
"github.com/stretchr/testify/require"
"golang.org/x/sys/unix"
"io"
"io/ioutil"
"os"
"path/filepath"
"strings"
@@ -133,7 +132,7 @@ func resetGlobals() {
func createFiles(t *testing.T) (string, []module) {
writeFile := func(path, text string) {
if err := ioutil.WriteFile(path, []byte(text), 0644); err != nil {
if err := os.WriteFile(path, []byte(text), 0644); err != nil {
t.Fatal(err)
}
}