Skip to content

Commit

Permalink
set SkipDaemonRestart in tryDelayEnroll
Browse files Browse the repository at this point in the history
this skips trying to restart the process which is currently broken
because the control daemon hasn't been started yet.  This restores the
previous behavior where the restart failing wasn't fatal.
  • Loading branch information
leehinman committed Jan 8, 2024
1 parent 58ef76d commit 3e1fcbf
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions internal/pkg/agent/cmd/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,9 @@ func tryDelayEnroll(ctx context.Context, logger *logger.Logger, cfg *configurati
}
options.DelayEnroll = false
options.FleetServer.SpawnAgent = false
// enrollCmd daemonReloadWithBackoff is broken, setting
// SkipDaemonRestart to true avoids running that code.
options.SkipDaemonRestart = true
c, err := newEnrollCmd(
ctx,
logger,
Expand Down

0 comments on commit 3e1fcbf

Please sign in to comment.