lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net/tstun: fix build on arm 

Signed-off-by: Maisem Ali <maisem@tailscale.com>
pull/2687/head
Maisem Ali 2021-08-18 15:18:44 -07:00 committed by Maisem Ali
parent fcca374fa7
commit 1f006025c2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/tstun/tun_linux.go
View File

@ -26,7 +26,7 @@ func diagnoseLinuxTUNFailure(tunName string, logf logger.Logf) {
logf("no TUN, and failed to look up kernel version: %v", err) logf("no TUN, and failed to look up kernel version: %v", err)
return return
} }
kernel := utsField(&un.Release) kernel := utsReleaseField(&un)
logf("Linux kernel version: %s", kernel) logf("Linux kernel version: %s", kernel)
modprobeOut, err := exec.Command("/sbin/modprobe", "tun").CombinedOutput() modprobeOut, err := exec.Command("/sbin/modprobe", "tun").CombinedOutput()
@ -84,9 +84,9 @@ func diagnoseLinuxTUNFailure(tunName string, logf logger.Logf) {
} }
} }
func utsField(p *[65]int8) string { func utsReleaseField(u *syscall.Utsname) string {
var sb strings.Builder var sb strings.Builder
for _, v := range p { for _, v := range u.Release {
if v == 0 { if v == 0 {
break break
} }