mirror of
https://github.com/Control-D-Inc/ctrld.git
synced 2026-08-10 13:20:33 +02:00
cmd/cli: set running iface for stop/uninstall commands
This commit is contained in:
@@ -1767,6 +1767,7 @@ func resetDnsTask(p *prog, s service.Service, isCtrldInstalled bool, currentRunn
|
|||||||
if currentRunningIface != "" {
|
if currentRunningIface != "" {
|
||||||
iface = currentRunningIface
|
iface = currentRunningIface
|
||||||
}
|
}
|
||||||
|
p.runningIface = iface
|
||||||
if isCtrldInstalled {
|
if isCtrldInstalled {
|
||||||
mainLog.Load().Debug().Msg("restore system DNS settings")
|
mainLog.Load().Debug().Msg("restore system DNS settings")
|
||||||
if status, _ := s.Status(); status == service.StatusRunning {
|
if status, _ := s.Status(); status == service.StatusRunning {
|
||||||
|
|||||||
@@ -522,6 +522,11 @@ func initStopCmd() *cobra.Command {
|
|||||||
mainLog.Load().Error().Msg(err.Error())
|
mainLog.Load().Error().Msg(err.Error())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
p.runningIface = iface
|
||||||
|
if ri := runningIface(s); ri != "" {
|
||||||
|
p.runningIface = ri
|
||||||
|
}
|
||||||
|
|
||||||
initLogging()
|
initLogging()
|
||||||
if err := checkDeactivationPin(s, nil); isCheckDeactivationPinErr(err) {
|
if err := checkDeactivationPin(s, nil); isCheckDeactivationPinErr(err) {
|
||||||
os.Exit(deactivationPinInvalidExitCode)
|
os.Exit(deactivationPinInvalidExitCode)
|
||||||
@@ -772,6 +777,10 @@ NOTE: Uninstalling will set DNS to values provided by DHCP.`,
|
|||||||
if iface == "" {
|
if iface == "" {
|
||||||
iface = "auto"
|
iface = "auto"
|
||||||
}
|
}
|
||||||
|
p.runningIface = iface
|
||||||
|
if ri := runningIface(s); ri != "" {
|
||||||
|
p.runningIface = ri
|
||||||
|
}
|
||||||
if err := checkDeactivationPin(s, nil); isCheckDeactivationPinErr(err) {
|
if err := checkDeactivationPin(s, nil); isCheckDeactivationPinErr(err) {
|
||||||
os.Exit(deactivationPinInvalidExitCode)
|
os.Exit(deactivationPinInvalidExitCode)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user