summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2013-05-01 19:17:44 +0200
committerDave Reisner <dreisner@archlinux.org>2013-05-02 00:15:28 +0200
commitf1d0772ce24e30d86c3cb98a8e5154dc9aa07a57 (patch)
treedaa8bf320594c46266c92cf1dce4b2f7dc8086fa
parent943c0feb1967e057b2ae518246859b50c58433b0 (diff)
downloadmkinitcpio-f1d0772ce24e30d86c3cb98a8e5154dc9aa07a57.tar.gz
mkinitcpio-f1d0772ce24e30d86c3cb98a8e5154dc9aa07a57.tar.xz
mkinitcpio: ensure ERR trap propagates to install_modules
Without this flag set, errors in install_modules are ignored, and mkinitcpio potentially exits without complaining about build problems when foolish people run out of disk (presumably after using /tmp as a build directory). Fixes FS#35037. Signed-off-by: Dave Reisner <dreisner@archlinux.org>
-rwxr-xr-xmkinitcpio2
1 files changed, 2 insertions, 0 deletions
diff --git a/mkinitcpio b/mkinitcpio
index 247fc81..0404ecc 100755
--- a/mkinitcpio
+++ b/mkinitcpio
@@ -517,11 +517,13 @@ parse_config "$_f_config"
# switch out the error handler to catch all errors
trap -- RETURN
trap '(( ++_builderrors ))' ERR
+set -o errtrace
install_modules "${!_modpaths[@]}"
# unset errtrace and trap
set +o functrace
+set +o errtrace
trap -- ERR
if [[ $_optgenimg ]]; then