From 8ea90e075c2d9467dc4f294cc69eba7acdf98cf8 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 10 Apr 2018 19:49:04 +0000
Subject: [PATCH] make-memstick.sh: put partition args on separate lines

This makes it easier to identify the individual partition types and
facilitates comparisons across architectures.

Reviewed by:	gjb
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
---
 release/amd64/make-memstick.sh   | 8 +++++++-
 release/arm64/make-memstick.sh   | 5 ++++-
 release/i386/make-memstick.sh    | 7 ++++++-
 release/powerpc/make-memstick.sh | 5 ++++-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/release/amd64/make-memstick.sh b/release/amd64/make-memstick.sh
index 3a151579abe..32ea6cd2cb4 100755
--- a/release/amd64/make-memstick.sh
+++ b/release/amd64/make-memstick.sh
@@ -36,6 +36,12 @@ makefs -B little -o label=FreeBSD_Install -o version=2 ${2}.part ${1}
 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
 
diff --git a/release/arm64/make-memstick.sh b/release/arm64/make-memstick.sh
index 8bcbb4677e0..1225acba44f 100755
--- a/release/arm64/make-memstick.sh
+++ b/release/arm64/make-memstick.sh
@@ -36,6 +36,9 @@ makefs -B little -o label=FreeBSD_Install -o version=2 ${2}.part ${1}
 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
 
diff --git a/release/i386/make-memstick.sh b/release/i386/make-memstick.sh
index 1d2ce552427..6aa1b507a68 100755
--- a/release/i386/make-memstick.sh
+++ b/release/i386/make-memstick.sh
@@ -36,6 +36,11 @@ makefs -B little -o label=FreeBSD_Install -o version=2 ${2}.part ${1}
 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
 
diff --git a/release/powerpc/make-memstick.sh b/release/powerpc/make-memstick.sh
index ae78783cc19..75a86a73e20 100755
--- a/release/powerpc/make-memstick.sh
+++ b/release/powerpc/make-memstick.sh
@@ -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}