From 851683566debbfdd51afdbd29185394ffb3e409e Mon Sep 17 00:00:00 2001
From: Werner <3305006+EvilOlaf@users.noreply.github.com>
Date: Thu, 9 Oct 2025 14:45:44 +0200
Subject: [PATCH] don't fail distro agnostic sshd adjustments when config is
 not found (#8729)

* don't fail ssh distro agnostic when openssh is not used

* addressing rabbit nit-pick

reasonable

* fix wording

Co-authored-by: tabrisnet <96966042+tabrisnet@users.noreply.github.com>

---------

Co-authored-by: tabrisnet <96966042+tabrisnet@users.noreply.github.com>
---
 lib/functions/rootfs/distro-agnostic.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/functions/rootfs/distro-agnostic.sh b/lib/functions/rootfs/distro-agnostic.sh
index 686e3c6940..21201b38b9 100644
--- a/lib/functions/rootfs/distro-agnostic.sh
+++ b/lib/functions/rootfs/distro-agnostic.sh
@@ -487,11 +487,13 @@ function install_distribution_agnostic() {
 		echo "nameserver $NAMESERVER" > "${SDCARD}"/etc/resolvconf/resolv.conf.d/head
 	fi
 
-	# permit root login via SSH for the first boot
-	sed -i 's/#\?PermitRootLogin .*/PermitRootLogin yes/' "${SDCARD}"/etc/ssh/sshd_config
-
-	# enable PubkeyAuthentication
-	sed -i 's/#\?PubkeyAuthentication .*/PubkeyAuthentication yes/' "${SDCARD}"/etc/ssh/sshd_config
+	# don't fail if OpenSSH is missing, e.g. if dropbear is installed instead
+	if [[ -f "${SDCARD}"/etc/ssh/sshd_config ]]; then
+		# permit root login via SSH for the first boot
+		sed -i 's/#\?PermitRootLogin .*/PermitRootLogin yes/' "${SDCARD}"/etc/ssh/sshd_config
+		# enable PubkeyAuthentication
+		sed -i 's/#\?PubkeyAuthentication .*/PubkeyAuthentication yes/' "${SDCARD}"/etc/ssh/sshd_config
+	fi
 
 	# avahi daemon defaults if exists
 	[[ -f "${SDCARD}"/usr/share/doc/avahi-daemon/examples/sftp-ssh.service ]] &&