cbsd
diff --git a/‎etc/defaults/vm-openbsd-cloud-openbsd-x86-74.conf
Lines changed: 0 additions & 106 deletions b/‎etc/defaults/vm-openbsd-cloud-openbsd-x86-74.conf
Lines changed: 0 additions & 106 deletions
diff --git a/‎etc/defaults/xlogin.conf
Lines changed: 5 additions & 1 deletion b/‎etc/defaults/xlogin.conf
Lines changed: 5 additions & 1 deletion
@@ -36,7 +36,11 @@ if [ -d ${jailsysdir}/${jname}/cloud-init ]; then
 				login_cmd="${SSH_CMD} -oStrictHostKeyChecking=no -oConnectTimeout=15 -oServerAliveInterval=10 root@${first_ip4_addr}"
 		else
 			eval _pubkey="\$ci_user_pubkey_${ci_user_add}"
-			if [ "${_pubkey}" = ".ssh/authorized_keys" ]; then
+			if [ "${_pubkey}" = ".ssh/id_rsa.pub" ]; then
+				echo "xlogin.conf: ${SSH_CMD} -oStrictHostKeyChecking=no -oConnectTimeout=15 -oServerAliveInterval=10 -i ${workdir}/.ssh/id_rsa ${ci_user_add}@${first_ip4_addr}" 1>&2
+				login_cmd="${SSH_CMD} -oStrictHostKeyChecking=no -oConnectTimeout=15 -oServerAliveInterval=10 -i ${workdir}/.ssh/id_rsa ${ci_user_add}@${first_ip4_addr}"
+			elif [ "${_pubkey}" = ".ssh/authorized_keys" ]; then
+				# back compat for CBSD < 14.1.3
 				echo "xlogin.conf: ${SSH_CMD} -oStrictHostKeyChecking=no -oConnectTimeout=15 -oServerAliveInterval=10 -i ${workdir}/.ssh/id_rsa ${ci_user_add}@${first_ip4_addr}" 1>&2
 				login_cmd="${SSH_CMD} -oStrictHostKeyChecking=no -oConnectTimeout=15 -oServerAliveInterval=10 -i ${workdir}/.ssh/id_rsa ${ci_user_add}@${first_ip4_addr}"
 			else