git: d64db8892f85 - main - release: make sh the default shell

The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/src/commit/?id=d64db8892f8519f108d838f8d7e1d3b675ed37cd

commit d64db8892f8519f108d838f8d7e1d3b675ed37cd
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2026-01-08 15:28:34 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2026-01-09 08:07:20 +0000

    release: make sh the default shell
    
    The default shell for root has been changed to sh(1) followup changing
    in release images sh(1) the shell for the "freebsd" user.
    
    MFC After:      1 week
    Reviewed by:    manu, emaste (re)
    Approved by:    manu, emaste (re)
    Differential Revision:  https://reviews.freebsd.org/D54602
---
 release/tools/arm.subr     | 2 +-
 release/tools/vagrant.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/release/tools/arm.subr b/release/tools/arm.subr
index 55e918e36d97..05436b4f00f6 100644
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -98,7 +98,7 @@ arm_create_user() {
 	chroot ${CHROOTDIR} /usr/sbin/pw -R ${DESTDIR} \
 		useradd freebsd \
 		-m -M 0755 -w yes -n freebsd -u 1001 -g 1001 -G 0 \
-		-c 'FreeBSD User' -d '/home/freebsd' -s '/bin/csh'
+		-c 'FreeBSD User' -d '/home/freebsd' -s '/bin/sh'
 	chroot ${CHROOTDIR} /usr/sbin/pw -R ${DESTDIR} \
 		usermod root -w yes
 
diff --git a/release/tools/vagrant.conf b/release/tools/vagrant.conf
index 6f4420bf26cc..37eff7a899ab 100644
--- a/release/tools/vagrant.conf
+++ b/release/tools/vagrant.conf
@@ -39,7 +39,7 @@ vagrant_common () {
 	/usr/sbin/pw -R ${DESTDIR} -M ${DESTDIR}/METALOG \
 		useradd vagrant \
 		-m -M 0755 -w yes -n vagrant -u 1001 -g 1001 -G 0 \
-		-c 'Vagrant User' -d '/home/vagrant' -s '/bin/csh'
+		-c 'Vagrant User' -d '/home/vagrant' -s '/bin/sh'
 
 	# Change root's password to vagrant
 	echo 'vagrant' | /usr/sbin/pw -R ${DESTDIR} usermod root -h 0