summary refs log tree commit diff
path: root/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh
diff options
context:
space:
mode:
authorSamuel Dionne-Riel <samuel@dionne-riel.com>2020-06-10 21:17:09 -0400
committerSamuel Dionne-Riel <samuel@dionne-riel.com>2020-06-11 14:41:18 -0400
commit37e50ca63513072d7024a3c44500684b4f2e032b (patch)
tree001b2e1f8c6a480e091863347f79b32b71041b55 /nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh
parent5f7d9d0985ad49e36f0477d65d29f38efd60d6cd (diff)
downloadnixpkgs-37e50ca63513072d7024a3c44500684b4f2e032b.tar
nixpkgs-37e50ca63513072d7024a3c44500684b4f2e032b.tar.gz
nixpkgs-37e50ca63513072d7024a3c44500684b4f2e032b.tar.bz2
nixpkgs-37e50ca63513072d7024a3c44500684b4f2e032b.tar.lz
nixpkgs-37e50ca63513072d7024a3c44500684b4f2e032b.tar.xz
nixpkgs-37e50ca63513072d7024a3c44500684b4f2e032b.tar.zst
nixpkgs-37e50ca63513072d7024a3c44500684b4f2e032b.zip
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".
Diffstat (limited to 'nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh')
-rw-r--r--nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh5
1 files changed, 4 insertions, 1 deletions
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