diff -Nru livecd-rootfs-2.664.51/debian/changelog livecd-rootfs-2.664.52/debian/changelog --- livecd-rootfs-2.664.51/debian/changelog 2023-10-19 17:17:20.000000000 +0000 +++ livecd-rootfs-2.664.52/debian/changelog 2024-01-22 11:38:05.000000000 +0000 @@ -1,3 +1,9 @@ +livecd-rootfs (2.664.52) focal; urgency=medium + + * fix: use correct sshd_config.d/ ordering. (LP: #2049860) + + -- Thomas Bechtold Mon, 22 Jan 2024 17:08:05 +0530 + livecd-rootfs (2.664.51) focal; urgency=medium [ Steve Langasek ] diff -Nru livecd-rootfs-2.664.51/live-build/ubuntu-cpc/hooks.d/chroot/052-ssh_authentication.chroot livecd-rootfs-2.664.52/live-build/ubuntu-cpc/hooks.d/chroot/052-ssh_authentication.chroot --- livecd-rootfs-2.664.51/live-build/ubuntu-cpc/hooks.d/chroot/052-ssh_authentication.chroot 2023-10-19 17:17:20.000000000 +0000 +++ livecd-rootfs-2.664.52/live-build/ubuntu-cpc/hooks.d/chroot/052-ssh_authentication.chroot 2024-01-22 11:38:05.000000000 +0000 @@ -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