For Qubes, this requires switching from sh to bash. This reduces the number of times the target filename needs to be written to 1.
Expand the comment to explain the concatination constraints. No functional change. Signed-off-by: Andrew Cooper <[email protected]> --- CC: Anthony PERARD <[email protected]> CC: Stefano Stabellini <[email protected]> CC: Michal Orzel <[email protected]> CC: Marek Marczykowski-Górecki <[email protected]> I would like to find a slightly nicer way of conditional parts, but nothing comes to mind. --- automation/scripts/qubes-x86-64.sh | 14 +++++++++----- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 16 +++++++++------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 10af274a0ba7..1dd3f48b3d29 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -ex -o pipefail @@ -187,10 +187,14 @@ Kernel \r on an \m (\l) rm -rf rootfs fi -# Dom0 rootfs -cp binaries/ucode.cpio binaries/dom0-rootfs.cpio.gz -cat binaries/rootfs.cpio.gz >> binaries/dom0-rootfs.cpio.gz -cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz +# Dom0 rootfs. The order or concatination is important; ucode wants to come +# first, and all uncompressed must be ahead of compressed. +parts=( + binaries/ucode.cpio + binaries/rootfs.cpio.gz + binaries/xen-tools.cpio.gz +) +cat "${parts[@]}" > binaries/dom0-rootfs.cpio.gz # test-local configuration mkdir -p rootfs diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 8f02fa73bd06..0fbabb41054a 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -103,13 +103,15 @@ find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs -# Dom0 rootfs -cp binaries/ucode.cpio binaries/dom0-rootfs.cpio.gz -cat binaries/rootfs.cpio.gz >> binaries/dom0-rootfs.cpio.gz -cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz -if [[ "${TEST}" == argo ]]; then - cat binaries/argo.cpio.gz >> binaries/dom0-rootfs.cpio.gz -fi +# Dom0 rootfs. The order or concatination is important; ucode wants to come +# first, and all uncompressed must be ahead of compressed. +parts=( + binaries/ucode.cpio + binaries/rootfs.cpio.gz + binaries/xen-tools.cpio.gz +) +[[ "${TEST}" == argo ]] && parts+=(binaries/argo.cpio.gz) +cat "${parts[@]}" > binaries/dom0-rootfs.cpio.gz # test-local configuration mkdir -p rootfs -- 2.39.5
