svn commit: r338400 - head/release/tools

[Kyle Evans]

Author: kevans
Date: Thu Aug 30 18:00:28 2018
New Revision: 338400
URL: https://svnweb.freebsd.org/changeset/base/338400

Log:
  release.sh: disable colors and the beastie menu for ARM/ARM64 targets
  
  lualoader has moved to a model where the user is expected to disable color
  as desired, rather than disabling it automatically for serial boots, due to
  more wide-spread support for color sequences.
  
  In a similar vain, though also to reduce special cases, lualoader no
  longer disables the beastie menu automatically for !x86. This was done in
  Forth land with a different loader.rc that simply didn't invoke the menu
  routines, thus wasn't necessary.
  
  This set of changes puts release images back to how they would've been
  experienced prior to the switch to Lua.
  
  Approved by:	re (rgrimes)

Modified:
  head/release/tools/arm.subr

Modified: head/release/tools/arm.subr
==============================================================================
--- head/release/tools/arm.subr	Thu Aug 30 15:52:03 2018	(r338399)
+++ head/release/tools/arm.subr	Thu Aug 30 18:00:28 2018	(r338400)
@@ -151,6 +151,15 @@ arm_setup_fdt_overlays() {
 	     >> ${CHROOTDIR}/${DESTDIR}/boot/loader.conf
 }
 
+arm_setup_minimal_loader() {
+	echo '# Disable the beastie menu and color' \
+		>> ${CHROOTDIR}/${DESTDIR}/boot/loader.conf
+	echo 'beastie_disable="YES"' \
+		>> ${CHROOTDIR}/${DESTDIR}/boot/loader.conf
+	echo 'loader_color="NO"' \
+		>> ${CHROOTDIR}/${DESTDIR}/boot/loader.conf
+}
+
 arm_install_base() {
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${DESTDIR}
 	eval chroot ${CHROOTDIR} make -C ${WORLDDIR} \
@@ -164,6 +173,7 @@ arm_install_base() {
 	arm_setup_usb_otg
 	arm64_setup_multicons
 	arm_setup_fdt_overlays
+	arm_setup_minimal_loader
 
 	echo '# Custom /etc/fstab for FreeBSD embedded images' \
 		> ${CHROOTDIR}/${DESTDIR}/etc/fstab