From owner-svn-src-head@FreeBSD.ORG  Mon Apr 27 18:07:12 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 024D12EB;
 Mon, 27 Apr 2015 18:07:12 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 E4CBD16F1;
 Mon, 27 Apr 2015 18:07:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3RI7BWH003239;
 Mon, 27 Apr 2015 18:07:11 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3RI7BRT003238;
 Mon, 27 Apr 2015 18:07:11 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201504271807.t3RI7BRT003238@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 27 Apr 2015 18:07:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282107 - head/release/arm64
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Apr 2015 18:07:12 -0000

Author: gjb
Date: Mon Apr 27 18:07:11 2015
New Revision: 282107
URL: https://svnweb.freebsd.org/changeset/base/282107

Log:
  Do not nest the BSD and MBR partitions, which produces
  an unbootable image.  Use just an MBR scheme instead.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/arm64/make-memstick.sh

Modified: head/release/arm64/make-memstick.sh
==============================================================================
--- head/release/arm64/make-memstick.sh	Mon Apr 27 18:01:52 2015	(r282106)
+++ head/release/arm64/make-memstick.sh	Mon Apr 27 18:07:11 2015	(r282107)
@@ -36,8 +36,6 @@ if [ $? -ne 0 ]; then
 fi
 rm ${1}/etc/fstab
 
-mkimg -s bsd -p freebsd-ufs:=${2}.part -p freebsd-swap::1M -o ${2}.tmp
-mkimg -s mbr -p efi:=${1}/boot/boot1.efifat -p freebsd:=${2}.tmp -o ${2}
-rm ${2}.tmp
+mkimg -s mbr -p efi:=${1}/boot/boot1.efifat -p freebsd:=${2}.part -o ${2}
 rm ${2}.part