From 9c2fe8d21f9f376d1a731f3829f65ba2136d933e Mon Sep 17 00:00:00 2001 From: Cuong Manh Le Date: Tue, 14 Jan 2025 14:24:27 +0700 Subject: [PATCH] cmd/cli: set running iface for stop/uninstall commands --- cmd/cli/cli.go | 1 + cmd/cli/commands.go | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/cmd/cli/cli.go b/cmd/cli/cli.go index f0e927d..6b7ac8f 100644 --- a/cmd/cli/cli.go +++ b/cmd/cli/cli.go @@ -1767,6 +1767,7 @@ func resetDnsTask(p *prog, s service.Service, isCtrldInstalled bool, currentRunn if currentRunningIface != "" { iface = currentRunningIface } + p.runningIface = iface if isCtrldInstalled { mainLog.Load().Debug().Msg("restore system DNS settings") if status, _ := s.Status(); status == service.StatusRunning { diff --git a/cmd/cli/commands.go b/cmd/cli/commands.go index b174052..ebf3dec 100644 --- a/cmd/cli/commands.go +++ b/cmd/cli/commands.go @@ -522,6 +522,11 @@ func initStopCmd() *cobra.Command { mainLog.Load().Error().Msg(err.Error()) return } + p.runningIface = iface + if ri := runningIface(s); ri != "" { + p.runningIface = ri + } + initLogging() if err := checkDeactivationPin(s, nil); isCheckDeactivationPinErr(err) { os.Exit(deactivationPinInvalidExitCode) @@ -772,6 +777,10 @@ NOTE: Uninstalling will set DNS to values provided by DHCP.`, if iface == "" { iface = "auto" } + p.runningIface = iface + if ri := runningIface(s); ri != "" { + p.runningIface = ri + } if err := checkDeactivationPin(s, nil); isCheckDeactivationPinErr(err) { os.Exit(deactivationPinInvalidExitCode) }