[pull] main from u-root:main

.circleci/images/kernel-amd64/config_linux.txt

@@ -114,9 +114,24 @@ CONFIG_NET_SCH_CODEL=y
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=y
+CONFIG_NET_CLS_U32=y
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_GACT=y
 
+# Network tunneling
+CONFIG_INET6_ESP=y
+CONFIG_INET6_ESPINTCP=y
+CONFIG_INET6_ESP_OFFLOAD=y
+CONFIG_INET6_IPCOMP=y
+CONFIG_INET_IPCOMP=y
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_VTI=y
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_NET_IPGRE=y
+CONFIG_NET_IPGRE_DEMUX=y
+CONFIG_NET_IPIP=y
+CONFIG_NET_IPVTI=y
+
 # 9P net filesystem
 CONFIG_NET_9P=y
 CONFIG_NET_9P_VIRTIO=y
@@ -167,4 +182,4 @@ CONFIG_GCOV_PROFILE_ALL=y
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
-CONFIG_WATCHDOG_OPEN_TIMEOUT=0
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0

.circleci/images/kernel-arm/config_linux.txt

@@ -123,9 +123,23 @@ CONFIG_NET_SCH_CODEL=y
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=y
+CONFIG_NET_CLS_U32=y
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_GACT=y
 
+# Network tunneling
+CONFIG_INET6_ESP=y
+CONFIG_INET6_IPCOMP=y
+CONFIG_INET_IPCOMP=y
+CONFIG_IPV6_GRE=y
+CONFIG_IPV6_IOAM6_LWTUNNEL=y
+CONFIG_IPV6_VTI=y
+CONFIG_NET_FOU=y
+CONFIG_NET_IPGRE=y
+CONFIG_NET_IPGRE_DEMUX=y
+CONFIG_NET_IPIP=y
+CONFIG_NET_IPVTI=y
+
 # GPIO test - mock GPIO libraries
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_MOCKUP=y

.circleci/images/kernel-arm64/config_linux.txt

@@ -117,9 +117,22 @@ CONFIG_NET_SCH_CODEL=y
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=y
+CONFIG_NET_CLS_U32=y
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_GACT=y
 
+# Network tunneling
+CONFIG_INET6_IPCOMP=y
+CONFIG_INET_IPCOMP=y
+CONFIG_IPV6_GRE=y
+CONFIG_IPV6_IOAM6_LWTUNNEL=y
+CONFIG_IPV6_VTI=y
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_NET_IPGRE=y
+CONFIG_NET_IPGRE_DEMUX=y
+CONFIG_NET_IPIP=y
+CONFIG_NET_IPVTI=y
+
 # GPIO test - mock GPIO libraries
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_MOCKUP=y
@@ -168,4 +181,4 @@ CONFIG_EFI_BOOTLOADER_CONTROL=y
 
 # Watchdog
 CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
+CONFIG_WATCHDOG_CORE=y

.github/workflows/golangci-lint.yml

@@ -19,10 +19,10 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.24'
           cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
-          version: v1.64.5
-          args: --out-format=line-number --timeout=5m
+          version: v2.1.2
+          args: --timeout=5m

.github/workflows/tests.yml

@@ -60,7 +60,7 @@ jobs:
           mkdir gocov
           VMTEST_GOCOVERDIR=$(pwd)/gocov \
             VMTEST_GO_PROFILE=vmcoverage.txt runvmtest -- \
-            go test -v -timeout=15m \
+            go test -v -timeout=20m \
             -covermode=atomic ${{ matrix.extra-arg }} \
             -coverprofile=coverage.txt ./${{ matrix.pattern }}
 

.golangci.yml

@@ -1,37 +1,46 @@
+version: "2"
 linters:
-  disable-all: true
+  default: none
   enable:
-    - revive
+    - errorlint
     - ineffassign
+    - revive
     - staticcheck
-    - stylecheck
-    - errorlint
-
-linters-settings:
-  staticcheck:
-    checks: ["all", "-SA1019"]
-  stylecheck:
-    checks: ["all", "-ST1003"]
-  errorlint:
-    errorf: true
-    asserts: false
-    comparison: false
-
-issues:
-  exclude-dirs:
-    - pkg/uroot/test
-  exclude-rules:
-    - linters: [revive]
-      text: "don't use underscores"
-    - linters: [revive]
-      text: "don't use ALL_CAPS"
-    - linters: [revive]
-      text: "stutter"
-    - linters: [revive]
-      text: "unexported-return"
-    - linters: [revive]
-      text: "unused-parameter"
-    - linters: [revive]
-      text: "superfluous-else"
-    - linters: [revive]
-      text: "empty-block"
+  settings:
+    errorlint:
+      errorf: true
+      asserts: false
+      comparison: false
+    staticcheck:
+      checks:
+        - all
+        - -SA1019
+        - -ST1003
+        - -QF*
+  exclusions:
+    presets:
+      - comments
+    rules:
+      - linters:
+          - revive
+        text: don't use underscores
+      - linters:
+          - revive
+        text: don't use ALL_CAPS
+      - linters:
+          - revive
+        text: stutter
+      - linters:
+          - revive
+        text: unexported-return
+      - linters:
+          - revive
+        text: unused-parameter
+      - linters:
+          - revive
+        text: superfluous-else
+      - linters:
+          - revive
+        text: empty-block
+    paths:
+      - pkg/uroot/test

.vmtest.yaml

@@ -1,12 +1,12 @@
 amd64:
   VMTEST_QEMU:
-    container: "ghcr.io/hugelgupf/vmtest/qemu:main"
+    container: "ghcr.io/hugelgupf/vmtest/qemu:main@sha256:d5b3d31f39edb6394d20bdd76027512f956d78af9c6e49ecf2ab9ab59944638a"
     template: "{{.qemu}}/bin/qemu-system-x86_64 -L {{.qemu}}/pc-bios -m 1G"
     directories:
       qemu: "/zqemu"
 
   VMTEST_KERNEL:
-    container: "ghcr.io/u-root/u-root/test-kernel-amd64@sha256:0b4f399fd61f2f5e060c86216150ec12439851101921337add61402c185e8007"
+    container: "ghcr.io/u-root/u-root/test-kernel-amd64@sha256:8b6e8c08724ef0aa2809685c7adb98e1b9b000f79fa790ec254c3176ecc5ec93"
     template: "{{.bzImage}}"
     files:
       bzImage: "/bzImage"
@@ -25,26 +25,26 @@ amd64:
 
 arm:
   VMTEST_QEMU:
-    container: "ghcr.io/hugelgupf/vmtest/qemu:main"
+    container: "ghcr.io/hugelgupf/vmtest/qemu:main@sha256:d5b3d31f39edb6394d20bdd76027512f956d78af9c6e49ecf2ab9ab59944638a"
     template: "{{.qemu}}/bin/qemu-system-arm -M virt,highmem=off -L {{.qemu}}/pc-bios"
     directories:
       qemu: "/zqemu"
 
   VMTEST_KERNEL:
-    container: "ghcr.io/u-root/u-root/test-kernel-arm@sha256:0429fa0ab8dbc4d1913f1c2b8ccc45fa8000897c801ed90b90c14a15e1f32020"
+    container: "ghcr.io/u-root/u-root/test-kernel-arm@sha256:a3df0094d89dda04a3eb08d3c8df538b3d2cb3019962cbd8f8886ac624cc8838"
     template: "{{.zImage}}"
     files:
       zImage: "/zImage"
 
 arm64:
   VMTEST_QEMU:
-    container: "ghcr.io/hugelgupf/vmtest/qemu:main"
+    container: "ghcr.io/hugelgupf/vmtest/qemu:main@sha256:d5b3d31f39edb6394d20bdd76027512f956d78af9c6e49ecf2ab9ab59944638a"
     template: "{{.qemu}}/bin/qemu-system-aarch64 -machine virt -cpu max -m 1G -L {{.qemu}}/pc-bios"
     directories:
       qemu: "/zqemu"
 
   VMTEST_KERNEL:
-    container: "ghcr.io/u-root/u-root/test-kernel-arm64@sha256:e48f32266071edaec44445da98375fe512b1532640e256f9f7138633e0000866"
+    container: "ghcr.io/u-root/u-root/test-kernel-arm64@sha256:d0b65ec5584fef929828324b0f998ad7e853c95bcc2288a163ebdf64401fe5a0"
     template: "{{.Image}}"
     files:
       Image: "/Image"

cmds/core/backoff/main.go → cmds/core/backoff/backoff.go

@@ -1,4 +1,4 @@
-// Copyright 2012-2021 the u-root Authors. All rights reserved
+// Copyright 2012-2025 the u-root Authors. All rights reserved
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -11,13 +11,13 @@
 //	backoff will run the command until it succeeds or a timeout has passed.
 //	The default timeout is 30s.
 //	If -v is set, it will show what it is running, each time it is tried.
-//	If no args are given, it will just return.
+//	If no args are given, it will print command help.
 //
 // Example:
 //	$ backoff echo hi
 //	hi
 //	$
-//	$ backoff -v -t 2s false
+//	$ backoff -v -t=2s false
 //	  2022/03/31 14:29:37 Run ["false"]
 //	  2022/03/31 14:29:37 Set timeout to 2s
 //	  2022/03/31 14:29:37 "false" []:exit status 1
@@ -31,16 +31,40 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"log"
 	"os"
+	"os/exec"
+	"time"
+
+	"github.com/cenkalti/backoff/v4"
 )
 
 var (
-	timeout = flag.String("t", "", "Timeout for command")
-	verbose = flag.Bool("v", true, "Log each attempt to run the command")
-	v       = func(string, ...interface{}) {}
+	timeout = flag.Duration("t", 30*time.Second, "Timeout for command")
+	verbose = flag.Bool("v", false, "Log each attempt to run the command")
+	v       = func(string, ...any) {}
+
+	errNoCmd = fmt.Errorf("no command passed")
 )
 
+func run(timeout time.Duration, c string, a ...string) error {
+	if c == "" {
+		return errNoCmd
+	}
+	b := backoff.NewExponentialBackOff()
+	b.MaxElapsedTime = timeout
+	f := func() error {
+		cmd := exec.Command(c, a...)
+		cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
+		err := cmd.Run()
+		v("%q %q:%v", c, a, err)
+		return err
+	}
+
+	return backoff.Retry(f, b)
+}
+
 func main() {
 	flag.Parse()
 	if *verbose {
@@ -52,7 +76,7 @@ func main() {
 		os.Exit(1)
 	}
 	v("Run %q", a)
-	if err := runit(*timeout, a[0], a[1:]...); err != nil {
+	if err := run(*timeout, a[0], a[1:]...); err != nil {
 		log.Fatalf("Error: %v", err)
 	}
 }

cmds/core/backoff/main_test.go → cmds/core/backoff/backoff_test.go

@@ -1,4 +1,4 @@
-// Copyright 2021 the u-root Authors. All rights reserved
+// Copyright 2021-2025 the u-root Authors. All rights reserved
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -7,49 +7,42 @@ package main
 import (
 	"bytes"
 	"errors"
-	"fmt"
 	"regexp"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/u-root/u-root/pkg/testutil"
 )
 
 func TestRunIt(t *testing.T) {
 	for _, tt := range []struct {
 		name    string
-		timeout string
+		timeout time.Duration
 		cmd     string
 		args    []string
 		wantErr error
 	}{
 		{
 			name:    "_date",
-			timeout: "3s",
+			timeout: 3 * time.Second,
 			cmd:     "date",
 		},
 		{
 			name:    "noCmd",
-			timeout: "3s",
+			timeout: 3 * time.Second,
 			cmd:     "",
-			wantErr: ErrNoCmd,
+			wantErr: errNoCmd,
 		},
 		{
 			name:    "echo",
-			timeout: "3s",
+			timeout: 3 * time.Second,
 			cmd:     "echo",
 			args:    []string{"hi"},
 		},
-		{
-			name:    "echo_missing_unit",
-			timeout: "3",
-			cmd:     "echo",
-			args:    []string{"hi"},
-			wantErr: fmt.Errorf("time: missing unit in duration \"3\""),
-		},
 	} {
 		t.Run(tt.name, func(t *testing.T) {
-			if err := runit(tt.timeout, tt.cmd, tt.args...); !errors.Is(err, tt.wantErr) {
+			if err := run(tt.timeout, tt.cmd, tt.args...); !errors.Is(err, tt.wantErr) {
 				if err != nil {
 					if !strings.Contains(err.Error(), tt.wantErr.Error()) {
 						t.Errorf("runit(%s, %s, %s)= %q, want %q", tt.timeout, tt.cmd, tt.args, err, tt.wantErr)
@@ -70,9 +63,8 @@ func TestOK(t *testing.T) {
 	}{
 		{args: []string{}, stdout: "", exitok: false},
 		{args: []string{"date"}, stdout: ".*", exitok: true},
-		{args: []string{"-t", "wh", "date"}, stdout: ".*", stderr: ".*invalid.*duration.*wh", exitok: false},
 		{args: []string{"echo", "hi"}, stdout: ".*hi", exitok: true},
-		{args: []string{"-t", "3s", "false"}, exitok: false},
+		{args: []string{"-t", "1s", "false"}, exitok: false},
 	}
 
 	for _, v := range tests {