public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the option declaration of filesystems.*.neededForBoot to boot/stage-1.nix.

Browse Source 
svn path=/nixos/branches/modular-nixos/; revision=15940
This commit is contained in:
Nicolas Pierron 2009-06-11 16:04:03 +00:00
parent 0657b26ab1
commit 4001b66c88
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/system/boot/stage-1.nix
View File

@ -7,7 +7,7 @@
let let
inherit (pkgs.lib) mkOption; inherit (pkgs.lib) mkOption types;
options = { options = {
@ -53,6 +53,16 @@ let
Whether to show a nice splash screen while booting. Whether to show a nice splash screen while booting.
"; ";
}; };
fileSystems = mkOption {
options.neededForBoot = mkOption {
default = false;
type = types.enable;
description = "
Mount this file system to boot on NixOS.
";
};
};
}; };
@ -165,7 +175,7 @@ let
# booting (such as the FS containing /nix/store, or an FS needed for # booting (such as the FS containing /nix/store, or an FS needed for
# mounting /, like / on a loopback). # mounting /, like / on a loopback).
fileSystems = pkgs.lib.filter fileSystems = pkgs.lib.filter
(fs: fs.mountPoint == "/" || (fs ? neededForBoot && fs.neededForBoot)) (fs: fs.mountPoint == "/" || fs.neededForBoot)
config.fileSystems; config.fileSystems;

10
modules/tasks/filesystems.nix
View File

@ -97,16 +97,6 @@ let
<option>fileSystems.*.mountPoint</option>. <option>fileSystems.*.mountPoint</option>.
"; ";
}; };
# Should be moved inside boot-stage-1.nix
neededForBoot = mkOption {
default = false;
type = types.enable;
description = "
Mount this file system to boot on NixOS.
";
};
}; };
}; };