Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-22 19:01:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: use correct sshd_config.d/ ordering

Browse Source 
Commit 3b2eeb017153cbb wrongly backported a change to not modify
/etc/ssh/sshd_config . The correct fix from ubuntu/master is
3b2eeb017153c where the file is named 60-cloudimg-settings.conf
instead of 10-cloudimg-settings.conf.

This fixes problems with cloud-init which does write
50-cloud-init.conf which should have higher priority than the provided
file from the image.

(cherry picked from commit 434b21e2023c3c3e5261fbd78e2eefee9aac5b1e)
This commit is contained in:
Thomas Bechtold 2024-01-19 09:29:52 +01:00
parent 31730b7f6c
commit 85fa04c107
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
live-build/ubuntu-cpc/hooks.d/chroot/052-ssh_authentication.chroot
View File

@ -1,5 +1,8 @@
#!/bin/bash
cat << EOF >> "/etc/ssh/sshd_config.d/10-cloudimg-settings.conf"
# NOTE: the file number needs to be **higher** than the one
# cloud-init writes (cloud-init uses 50-cloud-init.conf) so
# the cloud-init file takes precedence
cat << EOF >> "/etc/ssh/sshd_config.d/60-cloudimg-settings.conf"
PasswordAuthentication no
EOF