From owner-svn-src-stable@freebsd.org  Mon Jul 25 14:36:57 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 12878BA3049;
 Mon, 25 Jul 2016 14:36:57 +0000 (UTC)
 (envelope-from emaste@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 mx1.freebsd.org (Postfix) with ESMTPS id D905F1C94;
 Mon, 25 Jul 2016 14:36:56 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6PEaugv046710;
 Mon, 25 Jul 2016 14:36:56 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6PEau7O046709;
 Mon, 25 Jul 2016 14:36:56 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201607251436.u6PEau7O046709@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 25 Jul 2016 14:36:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r303297 - stable/10/sys/boot/efi/boot1
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jul 2016 14:36:57 -0000

Author: emaste
Date: Mon Jul 25 14:36:55 2016
New Revision: 303297
URL: https://svnweb.freebsd.org/changeset/base/303297

Log:
  MFC r297871: boot1.efifat: provide a fallback startup.nsh
  
  In case the firmware falls through to executing startup.sh, populate it
  with the name of our boot loader. In normal operation this should not be
  necessary but may allow the system to boot if it would otherwise just
  remain at a shell prompt.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/sys/boot/efi/boot1/generate-fat.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/efi/boot1/generate-fat.sh
==============================================================================
--- stable/10/sys/boot/efi/boot1/generate-fat.sh	Mon Jul 25 14:35:48 2016	(r303296)
+++ stable/10/sys/boot/efi/boot1/generate-fat.sh	Mon Jul 25 14:36:55 2016	(r303297)
@@ -41,6 +41,8 @@ mkdir -p stub/efi/boot
 
 # Make a dummy file for boot1
 echo 'Boot1 START' | dd of=stub/efi/boot/$FILENAME cbs=$BOOT1_SIZE count=1 conv=block
+# Provide a fallback startup.nsh
+echo $FILENAME > stub/efi/boot/startup.nsh
 
 umount stub
 mdconfig -d -u $DEVICE