From 1266852fd8d8143bbe38caff65a3ea7577ffe04a Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 23 Aug 2016 17:41:31 +0000 Subject: Revert a soon to be useless pice of "nixos/stage-1: add mechanism which lustrates all impurities from / (#17784)" This reverts a pice of commit 3d16af70bf894ce15ec9bdcad3c9ac736dc43630. --- nixos/modules/system/boot/stage-1.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 9be7ad4ae077..baeba1d6b31d 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -131,16 +131,9 @@ let # The initrd only has to mount / or any FS marked as necessary for # booting (such as the FS containing /nix/store, or an FS needed for # mounting /, like / on a loopback). - # - # We need to guarantee that / is the first filesystem in the list so - # that if and when lustrateRoot is invoked, nothing else is mounted - fileSystems = let - filterNeeded = filter - (fs: fs.mountPoint != "/" && (fs.neededForBoot || elem fs.mountPoint [ "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ])); - filterRoot = filter - (fs: fs.mountPoint == "/"); - allFileSystems = attrValues config.fileSystems; - in (filterRoot allFileSystems) ++ (filterNeeded allFileSystems); + fileSystems = filter + (fs: fs.neededForBoot || elem fs.mountPoint [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ]) + (attrValues config.fileSystems); udevRules = pkgs.stdenv.mkDerivation { -- cgit 1.4.1