Revert "rmdir: avoid failing when directory did not exist"
This reverts commit 45db499d2de2235388212a911b8344b58ddfda36.
commit5495cb91eb7c3fe1d93be2ea08f75fdd7c907036
authorEelco Dolstra <edolstra@gmail.com>
dateSun 2 Feb 2020, 15:29 (7 years ago)
parent0c96026
nixos/modules/system/activation/activation-script.nix+2−2
@@ -205,7 +205,7 @@ in
205205 ''
206206 else ''
207207 rm -f /usr/bin/env
208− rmdir -p /usr/bin || true
208+ rmdir --ignore-fail-on-non-empty /usr/bin /usr
209209 '';
210210
211211 system.activationScripts.ld-linux =
@@ -218,7 +218,7 @@ in
218218 mv -f ${target}.tmp ${target} # atomically replace
219219 '' else ''
220220 rm -f ${target}
221− rmdir $(dirname ${target}) || true
221+ rmdir --ignore-fail-on-non-empty $(dirname ${target})
222222 '')
223223 {
224224 "i686-linux" ."/lib/ld-linux.so.2" = "${pkgs.glibc.out}/lib/ld-linux.so.2";