mirrors/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-12-23 18:21:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP: improve reliability of natlab

Browse Source 
Signed-off-by: Claus Lensbøl <claus@tailscale.com>
This commit is contained in:
Claus Lensbøl 2025-12-05 09:08:26 -05:00
parent cf40cf5ccb
commit 38a7452d3d
No known key found for this signature in database
GPG Key ID: 060429CBEC62B1B4
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gokrazy/natlabapp/config.json
View File

@ -17,6 +17,9 @@
"tailscale.com/cmd/tailscale": { "tailscale.com/cmd/tailscale": {
"ExtraFilePaths": { "ExtraFilePaths": {
"/usr": "usr-dir" "/usr": "usr-dir"
},
"ExtraFileContents": {
"/etc/sysctl.d/99-ipv6-dad.conf": "net.ipv6.conf.all.accept_dad = 0\nnet.ipv6.conf.default.accept_dad = 0"
} }
} }
}, },

7
tstest/integration/nat/nat_test.go
View File

@ -334,10 +334,10 @@ func (nt *natTest) runTest(addNode ...addNodeFunc) pingRoute {
cmd := exec.Command("qemu-system-x86_64", cmd := exec.Command("qemu-system-x86_64",
"-M", "microvm,isa-serial=off", "-M", "microvm,isa-serial=off",
"-m", "384M", "-m", "1024M",
"-nodefaults", "-no-user-config", "-nographic", "-nodefaults", "-no-user-config", "-nographic", "-enable-kvm",
"-kernel", nt.kernel, "-kernel", nt.kernel,
"-append", "console=hvc0 root=PARTUUID=60c24cc1-f3f9-427a-8199-76baa2d60001/PARTNROFF=1 ro init=/gokrazy/init panic=10 oops=panic pci=off nousb tsc=unstable clocksource=hpet gokrazy.remote_syslog.target="+sysLogAddr+" tailscale-tta=1"+envStr, "-append", "console=hvc0 root=PARTUUID=60c24cc1-f3f9-427a-8199-76baa2d60001/PARTNROFF=1 ro init=/gokrazy/init panic=10 oops=panic pci=off nousb tsc=unstable clocksource=kvm-clock gokrazy.remote_syslog.target="+sysLogAddr+" tailscale-tta=1"+envStr,
"-drive", "id=blk0,file="+disk+",format=qcow2", "-drive", "id=blk0,file="+disk+",format=qcow2",
"-device", "virtio-blk-device,drive=blk0", "-device", "virtio-blk-device,drive=blk0",
"-netdev", "stream,id=net0,addr.type=unix,addr.path="+sockAddr, "-netdev", "stream,id=net0,addr.type=unix,addr.path="+sockAddr,
@ -347,6 +347,7 @@ func (nt *natTest) runTest(addNode ...addNodeFunc) pingRoute {
"-chardev", "stdio,id=virtiocon0,mux=on", "-chardev", "stdio,id=virtiocon0,mux=on",
"-device", "virtconsole,chardev=virtiocon0", "-device", "virtconsole,chardev=virtiocon0",
"-mon", "chardev=virtiocon0,mode=readline", "-mon", "chardev=virtiocon0,mode=readline",
"-cpu", "host",
) )
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr