Merge branch 'main' into xattr-fix

u-root · Dec 13, 2024 · 6d6bf14 · 6d6bf14
2 parents 545bc62 + e834a54
commit 6d6bf14
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/cmds/cpu/cpu.go b/cmds/cpu/cpu.go
@@ -305,6 +305,9 @@ func main() {
 	if *port == "22" {
 		*sshd = true
 	}
+	if *srvnfs {
+		*ninep = false
+	}
 	verbose("connecting to %q port %q", host, *port)
 	if err := newCPU(host, a...); err != nil {
 		e := 1