Skip to content

Improve agentless default restart command#63011

Merged
rosstimothy merged 1 commit intomasterfrom
tross/agentless_join_restart_command
Jan 21, 2026
Merged

Improve agentless default restart command#63011
rosstimothy merged 1 commit intomasterfrom
tross/agentless_join_restart_command

Conversation

@rosstimothy
Copy link
Copy Markdown
Contributor

@rosstimothy rosstimothy commented Jan 21, 2026

The default restart command assumed that all OpenSSH services were named sshd. As time has passed various distrobutions have started naming the OpenSSH service ssh instead of sshd. To account for this the default restart command now attempts to restart any active service named sshd or ssh.

Resolves #42227.

Changelog: Fixed teleport join openssh on recent versions of Ubuntu.

The default restart command assumed that all OpenSSH services were
named sshd. As time has passed various distrobutions have started
naming the OpenSSH service ssh instead of sshd. To account for this
the default restart command now attempts to restart any active
service named sshd or ssh.

Resolves #42227.
@public-teleport-github-review-bot public-teleport-github-review-bot bot removed the request for review from kiosion January 21, 2026 19:13
@rosstimothy rosstimothy added this pull request to the merge queue Jan 21, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 21, 2026
@rosstimothy rosstimothy added this pull request to the merge queue Jan 21, 2026
Merged via the queue into master with commit 6b444ab Jan 21, 2026
50 checks passed
@rosstimothy rosstimothy deleted the tross/agentless_join_restart_command branch January 21, 2026 21:41
@backport-bot-workflows
Copy link
Copy Markdown
Contributor

@rosstimothy See the table below for backport results.

Branch Result
branch/v17 Failed
branch/v18 Create PR

rosstimothy added a commit that referenced this pull request Jan 21, 2026
The default restart command assumed that all OpenSSH services were
named sshd. As time has passed various distrobutions have started
naming the OpenSSH service ssh instead of sshd. To account for this
the default restart command now attempts to restart any active
service named sshd or ssh.

Resolves #42227.
rosstimothy added a commit that referenced this pull request Jan 28, 2026
#63011 missed that
the output from systemctl show includes a trailing \n. Additionally,
the teleport join openssh command now respects the -d flag and will
produce debug logging if requested.
rosstimothy added a commit that referenced this pull request Jan 28, 2026
#63011 missed that
the output from systemctl show includes a trailing \n. Additionally,
the teleport join openssh command now respects the -d flag and will
produce debug logging if requested.
rosstimothy added a commit that referenced this pull request Jan 29, 2026
The default restart command assumed that all OpenSSH services were
named sshd. As time has passed various distrobutions have started
naming the OpenSSH service ssh instead of sshd. To account for this
the default restart command now attempts to restart any active
service named sshd or ssh.

Resolves #42227.
github-merge-queue bot pushed a commit that referenced this pull request Jan 30, 2026
#63011 missed that
the output from systemctl show includes a trailing \n. Additionally,
the teleport join openssh command now respects the -d flag and will
produce debug logging if requested.
github-merge-queue bot pushed a commit that referenced this pull request Feb 6, 2026
The default restart command assumed that all OpenSSH services were
named sshd. As time has passed various distrobutions have started
naming the OpenSSH service ssh instead of sshd. To account for this
the default restart command now attempts to restart any active
service named sshd or ssh.

Resolves #42227.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

join openssh failing with Ubuntu 24.04

3 participants