svn commit: r333410 - stable/11/release/i386

[Ed Maste]

Author: emaste
Date: Wed May  9 14:38:07 2018
New Revision: 333410
URL: https://svnweb.freebsd.org/changeset/base/333410

Log:
  MFC r332446: switch i386 memstick installer images to MBR
  
  Some BIOSes have trouble booting from GPT in non-UEFI mode.  This is
  commonly reported with Lenovo laptops, including my x220.  As we do not
  currently support booting FreeBSD/i386 via UEFI there's no reason to
  prefer GPT.
  
  The "vestigial swap partition" was added in r265017 to work around an
  issue with loader's GPT support, so we should not need it when using
  MBR.
  
  We may want to make the same change to amd64, although the issue there is
  mitigated by such systems booting via UEFI in the common case.
  
  PR:		227422
  Approved by:	re
  Relnotes:	Yes
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/release/i386/make-memstick.sh
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/release/i386/make-memstick.sh
==============================================================================
--- stable/11/release/i386/make-memstick.sh	Wed May  9 14:11:35 2018	(r333409)
+++ stable/11/release/i386/make-memstick.sh	Wed May  9 14:38:07 2018	(r333410)
@@ -36,11 +36,9 @@ makefs -B little -o label=FreeBSD_Install -o version=2
 rm ${1}/etc/fstab
 rm ${1}/etc/rc.conf.local
 
-mkimg -s gpt \
-    -b ${1}/boot/pmbr \
-    -p freebsd-boot:=${1}/boot/gptboot \
-    -p freebsd-ufs:=${2}.part \
-    -p freebsd-swap::1M \
+mkimg -s mbr \
+    -b ${1}/boot/mbr \
+    -p freebsd:-"mkimg -s bsd -b ${1}/boot/boot -p freebsd-ufs:=${2}.part" \
     -o ${2}
 rm ${2}.part