svn commit: r332639 - in stable/11/release: amd64 arm64 i386 powerpc

[Ed Maste]

Author: emaste
Date: Tue Apr 17 00:46:21 2018
New Revision: 332639
URL: https://svnweb.freebsd.org/changeset/base/332639

Log:
  MFC r332390: make-memstick.sh: put partition args on separate lines
  
  This makes it easier to identify the individual partition types and
  facilitates comparisons across architectures.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: stable/11/release/amd64/make-memstick.sh
==============================================================================
--- stable/11/release/amd64/make-memstick.sh	Tue Apr 17 00:03:32 2018	(r332638)
+++ stable/11/release/amd64/make-memstick.sh	Tue Apr 17 00:46:21 2018	(r332639)
@@ -36,6 +36,12 @@ 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 efi:=${1}/boot/boot1.efifat -p freebsd-boot:=${1}/boot/gptboot -p freebsd-ufs:=${2}.part -p freebsd-swap::1M -o ${2}
+mkimg -s gpt \
+    -b ${1}/boot/pmbr \
+    -p efi:=${1}/boot/boot1.efifat \
+    -p freebsd-boot:=${1}/boot/gptboot \
+    -p freebsd-ufs:=${2}.part \
+    -p freebsd-swap::1M \
+    -o ${2}
 rm ${2}.part
 

Modified: stable/11/release/arm64/make-memstick.sh
==============================================================================
--- stable/11/release/arm64/make-memstick.sh	Tue Apr 17 00:03:32 2018	(r332638)
+++ stable/11/release/arm64/make-memstick.sh	Tue Apr 17 00:46:21 2018	(r332639)
@@ -36,6 +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 -p efi:=${1}/boot/boot1.efifat -p freebsd:=${2}.part -o ${2}
+mkimg -s gpt \
+    -p efi:=${1}/boot/boot1.efifat \
+    -p freebsd:=${2}.part \
+    -o ${2}
 rm ${2}.part
 

Modified: stable/11/release/i386/make-memstick.sh
==============================================================================
--- stable/11/release/i386/make-memstick.sh	Tue Apr 17 00:03:32 2018	(r332638)
+++ stable/11/release/i386/make-memstick.sh	Tue Apr 17 00:46:21 2018	(r332639)
@@ -36,6 +36,11 @@ 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 -o ${2}
+mkimg -s gpt \
+    -b ${1}/boot/pmbr \
+    -p freebsd-boot:=${1}/boot/gptboot \
+    -p freebsd-ufs:=${2}.part \
+    -p freebsd-swap::1M \
+    -o ${2}
 rm ${2}.part
 

Modified: stable/11/release/powerpc/make-memstick.sh
==============================================================================
--- stable/11/release/powerpc/make-memstick.sh	Tue Apr 17 00:03:32 2018	(r332638)
+++ stable/11/release/powerpc/make-memstick.sh	Tue Apr 17 00:46:21 2018	(r332639)
@@ -41,7 +41,10 @@ makefs -B big -o version=2 ${tempfile} ${1}
 rm ${1}/etc/fstab
 rm ${1}/etc/rc.conf.local
 
-mkimg -s apm -p freebsd-boot:=${1}/boot/boot1.hfs -p freebsd-ufs/FreeBSD_Install:=${tempfile} -o ${2}
+mkimg -s apm \
+    -p freebsd-boot:=${1}/boot/boot1.hfs \
+    -p freebsd-ufs/FreeBSD_Install:=${tempfile} \
+    -o ${2}
 
 rm -f ${tempfile}