Compare commits

..

No commits in common. "e52938bba5d6b860c59cea149742c463131158ef" and "7a277384f072a12ab08f7961bea8ac8827061f07" have entirely different histories.

View File

@ -111,14 +111,13 @@ EOF
((menu_number++)) ((menu_number++))
echo "" echo ""
echo "---- $menu_number. Configuring rootless networking (slirp4netns + builtin port driver)." echo "---- $menu_number. Configuring rootless networking (pasta + builtin port driver)."
echo "" echo ""
# slirp4netns is the net namespace driver; the builtin rootlesskit port # pasta replaces slirp4netns as the net namespace driver — higher
# driver skips slirp4netns's userspace port-handler and shaves # throughput, lower latency, native IPv6, much better UDP. The
# per-connection overhead. (pasta is faster but requires a recent passt # builtin rootlesskit port driver skips the slirp4netns userspace
# AND port driver none/implicit — the pasta+builtin combo is rejected by # port-handler and shaves per-connection overhead.
# 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"
@ -132,7 +131,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=slirp4netns' Environment='DOCKERD_ROOTLESS_ROOTLESSKIT_NET=pasta'
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"