Skip to content
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

Jump to bottom

RFC: fix #6686: Debian: enable ssh.service and make it work reliably on armbian-firstrun #6687

Merged
merged 3 commits into from
Jun 5, 2024
Merged

RFC: fix #6686: Debian: enable ssh.service and make it work reliably on armbian-firstrun #6687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
059803e
Revert commits 911c756083164c32051d533ca3f2de488f202130 and 30c47f6f6…
alexl83 Jun 2, 2024
6dba190
tweak armbian-firstrun.service to run after ssh.service (for host key…
alexl83 Jun 2, 2024
7259ff5
Merge branch 'main' into fix_ssh_thing
alexl83 Jun 4, 2024
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: 0 additions & 5 deletions lib/functions/rootfs/distro-agnostic.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,11 +413,6 @@ 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
1 change: 1 addition & 0 deletions packages/bsp/common/lib/systemd/system/armbian-firstrun.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[Unit]
Description=Armbian first run tasks
Before=getty.target system-getty.slice
After=ssh.service

[Service]
Type=simple
Expand Down