Skip to content

Commit

Permalink
RFC: disable ssh.service - enable ssh.socket AND switch firstlogin re…
Browse files Browse the repository at this point in the history
…load ssh to restart (armbian#6586)

* reload-or-restart ssh prevents botching if sshd is started by a systemd socket
* restart ssh prevents botching if sshd is started by a systemd socket
* move sshd activation from ssh.service to ssh.socket:
- more realiable, avoids possible race condition on first boot
- supplementary to PR#6586 - and commits ffee50a and 6725032
* Add display_alert explaining the change in SSH activation
  • Loading branch information
alexl83 authored May 17, 2024
1 parent 66b0171 commit fe64f1f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions lib/functions/rootfs/distro-agnostic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,11 @@ function install_distribution_agnostic() {
# @TODO: rpardini: still needed? people might want working Samba
disable_systemd_service_sdcard nmbd

# move sshd activation from ssh.service to ssh.socket (more realiable, avoids possible race condition on first boot) supplementary to ffee50a8a6b99bb4f35af90895e019eced7ff71b and 67250321918e59582b8f1003d331f4b1db253b21
display_alert "Moving SSH activation from service to socket" "systemd" "info"
disable_systemd_service_sdcard ssh
chroot_sdcard systemctl enable ssh.socket

# disable low-level kernel messages for non betas
if [[ -z $BETA ]]; then
sed -i "s/^#kernel.printk*/kernel.printk/" "${SDCARD}"/etc/sysctl.conf
Expand Down
2 changes: 1 addition & 1 deletion packages/bsp/common/usr/lib/armbian/armbian-firstlogin
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ if [[ -f /root/.not_logged_in_yet && -n $(tty) ]]; then
# re-enable passing locale environment via ssh
sed -e '/^#AcceptEnv LANG/ s/^#//' -i /etc/ssh/sshd_config
# restart sshd daemon
systemctl reload ssh.service
systemctl restart ssh.service

# rpardini: hacks per-dm, very much legacy stuff that works by a miracle
if [[ "${desktop_dm}" == "lightdm" ]] && [ -n "$RealName" ]; then
Expand Down

0 comments on commit fe64f1f

Please sign in to comment.