From 45db499d2de2235388212a911b8344b58ddfda36 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Thu, 19 Sep 2019 00:32:35 +0000
Subject: 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`
---
 nixos/modules/system/activation/activation-script.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nixos/modules/system/activation')

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";
-- 
cgit 1.4.1