summaryrefslogtreecommitdiffstats
path: root/config/binary_local-hooks
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2012-09-29 20:41:47 +0200
committerTails developers <amnesia@boum.org>2012-09-29 20:41:47 +0200
commit280b7770b4c7096dcfd81ef73a7c8d7e13c1e55c (patch)
tree83fb2c268a8a59d14624a90005bdf7f502877082 /config/binary_local-hooks
parent482aa225f84ecc419cbbfe2b98b54ea8298cc508 (diff)
parent705c381cd6c5813c837921dcfc8e7ca17183325a (diff)
Merge branch 'devel' into feature/multikernel
Conflicts: config/chroot_local-hooks/50-virtualbox config/chroot_local-hooks/52-update-rc.d config/chroot_local-includes/etc/init.d/tails-wipe-memory-on-media-removal vagrant/provision/assets/build-tails
Diffstat (limited to 'config/binary_local-hooks')
-rwxr-xr-xconfig/binary_local-hooks/10-syslinux_customize2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/binary_local-hooks/10-syslinux_customize b/config/binary_local-hooks/10-syslinux_customize
index 6ea2628..936c30f 100755
--- a/config/binary_local-hooks/10-syslinux_customize
+++ b/config/binary_local-hooks/10-syslinux_customize
@@ -1,5 +1,7 @@
#!/bin/bash
+set -e
+
# Including common functions
. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh