From 37e50ca63513072d7024a3c44500684b4f2e032b Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Wed, 10 Jun 2020 21:17:09 -0400 Subject: raspberrypi-builder: ensure scripts fails on error The way this ends up being called with the raspberry pi 4 image builder ends up not using the `-e` from the shebang. In turn, the builds fails during cross-compilation. The wrong coreutils ends up being used, but this is not made apparent. The issue I faced is already fixed on master, but this ensures no one ends up with a failed build "succeeding". --- nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh') diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh index c8b5bf2e61a..0541ca1ba62 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh @@ -1,4 +1,7 @@ -#! @bash@/bin/sh -e +#! @bash@/bin/sh + +# This can end up being called disregarding the shebang. +set -e shopt -s nullglob -- cgit 1.4.1