Don't silently ignore errors from the activation script

2014-08-15 01:57:36 +02:00
parent 883fa4f920
commit 785ed2b528
3 changed files with 10 additions and 3 deletions
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -66,6 +66,9 @@ in
                PATH=$PATH:$i/bin:$i/sbin
            done

+            _status=0
+            trap "_status=1" ERR
+
            # Ensure a consistent umask.
            umask 0022

@@ -84,6 +87,8 @@ in

            # Prevent the current configuration from being garbage-collected.
            ln -sfn /run/current-system /nix/var/nix/gcroots/current-system
+
+            exit $_status
          '';
      };