From owner-svn-src-all@freebsd.org Thu Aug 30 18:00:29 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 062C0EA8AD5; Thu, 30 Aug 2018 18:00:29 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B4D0D8CA09; Thu, 30 Aug 2018 18:00:28 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 95A777DC7; Thu, 30 Aug 2018 18:00:28 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7UI0Smt086997; Thu, 30 Aug 2018 18:00:28 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7UI0ShY086996; Thu, 30 Aug 2018 18:00:28 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201808301800.w7UI0ShY086996@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 30 Aug 2018 18:00:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r338400 - head/release/tools X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/release/tools X-SVN-Commit-Revision: 338400 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Aug 2018 18:00:29 -0000 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