cmd/tailscaled: move cleanup to an implicit action during startup

This removes a potentially increased boot delay for certain boot
topologies where they block on ExecStartPre that may have socket
activation dependencies on other system services (such as
systemd-resolved and NetworkManager).

Also rename cleanup to clean up in affected/immediately nearby places
per code review commentary.

Fixes #11599

Signed-off-by: James Tucker <james@tailscale.com>
This commit is contained in:
James Tucker
2024-04-02 19:52:19 -07:00
committed by James Tucker
parent 8d83adde07
commit db760d0bac
11 changed files with 31 additions and 28 deletions

View File

@ -236,11 +236,11 @@ func (r *openbsdRouter) UpdateMagicsockPort(_ uint16, _ string) error {
}
func (r *openbsdRouter) Close() error {
cleanup(r.logf, r.tunname)
cleanUp(r.logf, r.tunname)
return nil
}
func cleanup(logf logger.Logf, interfaceName string) {
func cleanUp(logf logger.Logf, interfaceName string) {
out, err := cmd("ifconfig", interfaceName, "down").CombinedOutput()
if err != nil {
logf("ifconfig down: %v\n%s", err, out)