Skip to content

fix agentless joining default restart command #63244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rosstimothy merged 1 commit into from
Jan 30, 2026
Merged

fix agentless joining default restart command #63244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions lib/config/configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2911,11 +2911,16 @@ func ConfigureOpenSSH(clf *CommandLineFlags, cfg *servicecfg.Config) error {
lib.SetInsecureDevMode(clf.InsecureMode)

// Apply command line --debug flag to override logger severity.
level := slog.LevelError
if clf.Debug {
cfg.SetLogLevel(slog.LevelDebug)
level = slog.LevelDebug
cfg.Debug = clf.Debug
}

// Ensure that the logging level is respected by the logger.
utils.InitLogger(utils.LoggingForDaemon, level)

if clf.AuthToken != "" {
// store the value of the --token flag:
cfg.SetToken(clf.AuthToken)
Expand Down
2 changes: 1 addition & 1 deletion lib/openssh/sshd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ func defaultRestart() error {
}

const activeService = "ActiveState=active"
if !bytes.Equal([]byte(activeService), out) {
if !bytes.Equal([]byte(activeService), bytes.TrimSpace(out)) {
slog.DebugContext(context.Background(), "skipping inactive OpenSSH service", "service", service)
continue
}
Expand Down
Loading