diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-02-02 15:29:40 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-02-02 15:29:40 +0100 |
| commit | 5495cb91eb7c3fe1d93be2ea08f75fdd7c907036 (patch) | |
| tree | 13c42b93016624c27786dee82ee05e4491842cc2 /nixos | |
| parent | 0c960262d159d3a884dadc3d4e4b131557dad116 (diff) | |
Revert "rmdir: avoid failing when directory did not exist"
This reverts commit 45db499d2de2235388212a911b8344b58ddfda36.
Diffstat (limited to 'nixos')
| -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 495d77dfd4974..9141c8222b738 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 -p /usr/bin || true + rmdir --ignore-fail-on-non-empty /usr/bin /usr ''; system.activationScripts.ld-linux = @@ -218,7 +218,7 @@ in mv -f ${target}.tmp ${target} # atomically replace '' else '' rm -f ${target} - rmdir $(dirname ${target}) || true + rmdir --ignore-fail-on-non-empty $(dirname ${target}) '') { "i686-linux" ."/lib/ld-linux.so.2" = "${pkgs.glibc.out}/lib/ld-linux.so.2"; |