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

clientupdate,net/tstun: add support for OpenWrt 25.12.0 using apk (#18545)

Browse Source 
OpenWrt is changing to using alpine like `apk` for package installation
over its previous opkg. Additionally, they are not using the same repo
files as alpine making installation fail.

Add support for the new repository files and ensure that the required
package detection system uses apk.

Updates #18535

Signed-off-by: Claus Lensbøl <claus@tailscale.com>
This commit is contained in:
Claus Lensbøl
2026-03-05 13:39:07 -05:00
committed by GitHub
parent d82e478dbc
commit 1b53c00f2b
3 changed files with 188 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/tstun/tun_linux.go
+26 -8
View File
@@ -86,14 +86,32 @@ func diagnoseLinuxTUNFailure(tunName string, logf logger.Logf, createErr error)
logf("kernel/drivers/net/tun.ko found on disk, but not for current kernel; are you in middle of a system update and haven't rebooted? found: %s", findOut)
}
case distro.OpenWrt:
out, err := exec.Command("opkg", "list-installed").CombinedOutput()
if err != nil {
logf("error querying OpenWrt installed packages: %s", out)
return
}
for _, pkg := range []string{"kmod-tun", "ca-bundle"} {
if !bytes.Contains(out, []byte(pkg+" - ")) {
logf("Missing required package %s; run: opkg install %s", pkg, pkg)
// OpenWRT switched to using apk as a package manager as of OpenWrt 25.12.0.
// Find out what is used on this system and use that, Maybe we can get rid
// of opkg in the future but for now keep checking.
if path, err := exec.LookPath("apk"); err == nil && path != "" {
// Test with apk
out, err := exec.Command("apk", "info").CombinedOutput()
if err != nil {
logf("error querying OpenWrt installed packages with apk: %s", out)
return
}
for _, pkg := range []string{"kmod-tun", "ca-bundle"} {
if !bytes.Contains(out, []byte(pkg)) {
logf("Missing required package %s; run: apk add %s", pkg, pkg)
}
}
} else { // Check for package with opkg (legacy)
out, err := exec.Command("opkg", "list-installed").CombinedOutput()
if err != nil {
logf("error querying OpenWrt installed packages with opkg: %s", out)
return
}
for _, pkg := range []string{"kmod-tun", "ca-bundle"} {
if !bytes.Contains(out, []byte(pkg+" - ")) {
logf("Missing required package %s; run: opkg install %s", pkg, pkg)
}
}
}
}