From d31dceaffd7859c0213a4b5193712e2f2f5024d2 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Sat, 11 Jan 2025 08:01:13 -0800 Subject: [PATCH] lanscaping: remove more SSH (childproc package) -rwxr-xr-x@ 1 bradfitz staff 11443282 Jan 11 08:01 /Users/bradfitz/bin/tailscaled.min -rwxr-xr-x@ 1 bradfitz staff 11927704 Jan 11 08:01 /Users/bradfitz/bin/tailscaled.minlinux Change-Id: I450d886cba27e6df7233208f8cfcfd066aa74b67 Signed-off-by: Brad Fitzpatrick --- cmd/tailscaled/depaware-minlinux.txt | 1 - cmd/tailscaled/tailscaled.go | 16 ---------------- 2 files changed, 17 deletions(-) diff --git a/cmd/tailscaled/depaware-minlinux.txt b/cmd/tailscaled/depaware-minlinux.txt index 8748c3525..27fd99b9d 100644 --- a/cmd/tailscaled/depaware-minlinux.txt +++ b/cmd/tailscaled/depaware-minlinux.txt @@ -42,7 +42,6 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de tailscale.com from tailscale.com/version tailscale.com/atomicfile from tailscale.com/ipn+ tailscale.com/client/tailscale/apitype from tailscale.com/ipn/ipnlocal+ - tailscale.com/cmd/tailscaled/childproc from tailscale.com/cmd/tailscaled tailscale.com/control/controlbase from tailscale.com/control/controlhttp+ tailscale.com/control/controlclient from tailscale.com/cmd/tailscaled+ tailscale.com/control/controlhttp from tailscale.com/control/controlclient diff --git a/cmd/tailscaled/tailscaled.go b/cmd/tailscaled/tailscaled.go index b3e286227..06ec3c32e 100644 --- a/cmd/tailscaled/tailscaled.go +++ b/cmd/tailscaled/tailscaled.go @@ -26,7 +26,6 @@ import ( "syscall" "time" - "tailscale.com/cmd/tailscaled/childproc" "tailscale.com/control/controlclient" "tailscale.com/envknob" "tailscale.com/hostinfo" @@ -128,7 +127,6 @@ var ( var subCommands = map[string]*func([]string) error{ "install-system-daemon": &installSystemDaemon, "uninstall-system-daemon": &uninstallSystemDaemon, - "be-child": &beChildFunc, } var beCLI func() // non-nil if CLI is linked in @@ -638,20 +636,6 @@ func runDebugServer(mux *http.ServeMux, addr string) { } } -var beChildFunc = beChild - -func beChild(args []string) error { - if len(args) == 0 { - return errors.New("missing mode argument") - } - typ := args[0] - f, ok := childproc.Code[typ] - if !ok { - return fmt.Errorf("unknown be-child mode %q", typ) - } - return f(args[1:]) -} - // dieOnPipeReadErrorOfFD reads from the pipe named by fd and exit the process // when the pipe becomes readable. We use this in tests as a somewhat more // portable mechanism for the Linux PR_SET_PDEATHSIG, which we wish existed on