Merge claude/2

This commit is contained in:
librelad 2026-05-23 22:02:42 +01:00
commit e52938bba5

View File

@ -111,13 +111,14 @@ EOF
((menu_number++)) ((menu_number++))
echo "" echo ""
echo "---- $menu_number. Configuring rootless networking (pasta + builtin port driver)." echo "---- $menu_number. Configuring rootless networking (slirp4netns + builtin port driver)."
echo "" echo ""
# pasta replaces slirp4netns as the net namespace driver — higher # slirp4netns is the net namespace driver; the builtin rootlesskit port
# throughput, lower latency, native IPv6, much better UDP. The # driver skips slirp4netns's userspace port-handler and shaves
# builtin rootlesskit port driver skips the slirp4netns userspace # per-connection overhead. (pasta is faster but requires a recent passt
# port-handler and shaves per-connection overhead. # AND port driver none/implicit — the pasta+builtin combo is rejected by
# rootlesskit, which silently kept the rootless daemon from starting.)
systemd_user_dir="/home/$CFG_DOCKER_INSTALL_USER/.config/systemd/user" systemd_user_dir="/home/$CFG_DOCKER_INSTALL_USER/.config/systemd/user"
local result=$(dockerCommandRunInstallUser "mkdir -p $systemd_user_dir") local result=$(dockerCommandRunInstallUser "mkdir -p $systemd_user_dir")
checkSuccess "Create the systemd user directory if it doesn't exist" checkSuccess "Create the systemd user directory if it doesn't exist"
@ -131,7 +132,7 @@ EOF
sudo bash -c "cat <<EOL > '$override_conf_file' sudo bash -c "cat <<EOL > '$override_conf_file'
[Service] [Service]
Environment='DOCKERD_ROOTLESS_ROOTLESSKIT_NET=pasta' Environment='DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns'
Environment='DOCKERD_ROOTLESS_ROOTLESSKIT_PORT_DRIVER=builtin' Environment='DOCKERD_ROOTLESS_ROOTLESSKIT_PORT_DRIVER=builtin'
Environment='DOCKERD_ROOTLESS_ROOTLESSKIT_MTU=$CFG_NETWORK_MTU' Environment='DOCKERD_ROOTLESS_ROOTLESSKIT_MTU=$CFG_NETWORK_MTU'
EOL" EOL"