diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-15 01:57:36 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-15 02:14:34 +0200 |
| commit | 785ed2b528322676a256fc14a2201773626f46bb (patch) | |
| tree | 43fc06481eb73940f901153574d4ac8106dc8fda /nixos/modules/system/activation/activation-script.nix | |
| parent | 883fa4f9205b2aa699760a73e1f1a26bb4f5296e (diff) | |
| download | nixlib-785ed2b528322676a256fc14a2201773626f46bb.tar nixlib-785ed2b528322676a256fc14a2201773626f46bb.tar.gz nixlib-785ed2b528322676a256fc14a2201773626f46bb.tar.bz2 nixlib-785ed2b528322676a256fc14a2201773626f46bb.tar.lz nixlib-785ed2b528322676a256fc14a2201773626f46bb.tar.xz nixlib-785ed2b528322676a256fc14a2201773626f46bb.tar.zst nixlib-785ed2b528322676a256fc14a2201773626f46bb.zip | |
Don't silently ignore errors from the activation script
Diffstat (limited to 'nixos/modules/system/activation/activation-script.nix')
| -rw-r--r-- | nixos/modules/system/activation/activation-script.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index b1bad956b4bb..2e5a70b3aa54 100644 --- 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 ''; }; |