From c2556a8e39b3d0864eedc0db4e23961cb977ee12 Mon Sep 17 00:00:00 2001 From: Cuong Manh Le Date: Sat, 4 May 2024 07:49:48 +0700 Subject: [PATCH] cmd/cli: add skipping self checks flag --- cmd/cli/cli.go | 6 ++++++ cmd/cli/main.go | 1 + 2 files changed, 7 insertions(+) diff --git a/cmd/cli/cli.go b/cmd/cli/cli.go index b54a631..7c4a5d0 100644 --- a/cmd/cli/cli.go +++ b/cmd/cli/cli.go @@ -401,6 +401,7 @@ func initCLI() { startCmd.Flags().StringVarP(&iface, "iface", "", "", `Update DNS setting for iface, "auto" means the default interface gateway`) startCmd.Flags().StringVarP(&nextdns, nextdnsFlagName, "", "", "NextDNS resolver id") startCmd.Flags().StringVarP(&cdUpstreamProto, "proto", "", ctrld.ResolverTypeDOH, `Control D upstream type, either "doh" or "doh3"`) + startCmd.Flags().BoolVarP(&skipSelfChecks, "skip_self_checks", "", false, `Skip self checks after installing ctrld service`) routerCmd := &cobra.Command{ Use: "setup", @@ -1618,6 +1619,11 @@ func selfCheckStatus(s service.Service) (bool, service.Status, error) { if status != service.StatusRunning { return false, status, nil } + // Skip self checks if set. + if skipSelfChecks { + return true, status, nil + } + dir, err := socketDir() if err != nil { mainLog.Load().Error().Err(err).Msg("failed to check ctrld listener status: could not get home directory") diff --git a/cmd/cli/main.go b/cmd/cli/main.go index 9c64aa0..279f5f2 100644 --- a/cmd/cli/main.go +++ b/cmd/cli/main.go @@ -35,6 +35,7 @@ var ( nextdns string cdUpstreamProto string deactivationPin int64 + skipSelfChecks bool mainLog atomic.Pointer[zerolog.Logger] consoleWriter zerolog.ConsoleWriter