diff options
| author | volth <volth@volth.com> | 2019-09-19 00:32:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-19 00:32:35 +0000 |
| commit | 45db499d2de2235388212a911b8344b58ddfda36 (patch) | |
| tree | 85373669dad5349d811617f0683f619a680811d3 /nixos/modules/system/activation | |
| parent | af665d822a166ae62547c1c310207f11acaded17 (diff) | |
| download | nixlib-45db499d2de2235388212a911b8344b58ddfda36.tar nixlib-45db499d2de2235388212a911b8344b58ddfda36.tar.gz nixlib-45db499d2de2235388212a911b8344b58ddfda36.tar.bz2 nixlib-45db499d2de2235388212a911b8344b58ddfda36.tar.lz nixlib-45db499d2de2235388212a911b8344b58ddfda36.tar.xz nixlib-45db499d2de2235388212a911b8344b58ddfda36.tar.zst nixlib-45db499d2de2235388212a911b8344b58ddfda36.zip | |
rmdir: avoid failing when directory did not exist
I bet nobody has `environment.usrbinenv = null`, it would fail on the second activation trying to `rmdir` inexisting `/usr/bin`
Diffstat (limited to 'nixos/modules/system/activation')
| -rw-r--r-- | nixos/modules/system/activation/activation-script.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index 9141c8222b73..495d77dfd497 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -205,7 +205,7 @@ in '' else '' rm -f /usr/bin/env - rmdir --ignore-fail-on-non-empty /usr/bin /usr + rmdir -p /usr/bin || true ''; system.activationScripts.ld-linux = @@ -218,7 +218,7 @@ in mv -f ${target}.tmp ${target} # atomically replace '' else '' rm -f ${target} - rmdir --ignore-fail-on-non-empty $(dirname ${target}) + rmdir $(dirname ${target}) || true '') { "i686-linux" ."/lib/ld-linux.so.2" = "${pkgs.glibc.out}/lib/ld-linux.so.2"; |