Solved From 14.0 to 14.1 process stops

[kerogaz]

The following file could not be merged automatically: /etc/ssh/sshd_config
Press Enter to edit this file in /usr/bin/vi and resolve the conflicts
manually...


# $OpenBSD: sshd_config,v 1.104 2021/07/02 05:11:21 dtucker Exp $

# This is the sshd server system-wide configuration file. See
# sshd_config(5) for more information.

# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin

# The strategy used for options in the default sshd_config shipped with
# OpenSSH is to specify options with their default value where
# possible, but leave them commented. Uncommented options override the
# default value.

# Note that some of FreeBSD's defaults differ from OpenBSD's, and
# FreeBSD has a few additional options.

.......................................
...................................

<<<<<<< current version

#VersionAddendum FreeBSD-20230316

#VersionAddendum FreeBSD-20231004

=======
#VersionAddendum FreeBSD-20240318
>>>>>>> 14.1-RELEASE

# no default banner path
#Banner none

# override default of no subsystems
Subsystem sftp /usr/libexec/sftp-server

# Example of overriding settings on a per-user basis
#Match User anoncvs
# X11Forwarding no
# AllowTcpForwarding no
# PermitTTY no
# ForceCommand cvs server
The process stopped at this step and does not go further.

 

[kerogaz]

After typing zz
Merge conflict markers remain in: /etc/ssh/sshd_config
These must be resolved for the system to be functional.

Press Enter to return to editing this file.

 

[kerogaz]

:q!

Merge conflict markers remain in: /etc/ssh/sshd_config
These must be resolved for the system to be functional.

Press Enter to return to editing this file.

 

[kerogaz]

I removed the markers and everything went well. Thanks to everyone and me.

 

[mro]

to avoid that I use

$ fgrep ssh /etc/rc.conf ; cat /etc/ssh/sshd_config.custom
sshd_enable="YES"
sshd_flags="-f /etc/ssh/sshd_config.custom"
# https://forums.FreeBSD.org/threads/freebsd-update-files-have-been-modified-locally.89974/post-626328
Include sshd_config.d/*.conf
Include sshd_config

and put my custom stuff into a separate file.

 

[kerogaz]

Installing updates...
Restarting sshd after upgrade
Performing sanity check on sshd configuration.
/etc/ssh/sshd_config: line 108: Bad configuration option: current
/etc/ssh/sshd_config line 116: no argument after keyword "14.1-RELEASE"
/etc/ssh/sshd_config: terminating, 2 bad configuration options
Scanning /usr/share/certs/untrusted for certificates...
Scanning /usr/share/certs/trusted for certificates...
rmdir: ///usr/src/sys/contrib/openzfs/cmd/arc_summary: Directory not empty
done.

freebsd-version
14.1-RELEASE-p3