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

* Require fileSystems to be set.

Browse Source 
svn path=/nixos/trunk/; revision=34080
This commit is contained in:
Eelco Dolstra 2012-05-14 01:33:11 +00:00
parent 71d867daf6
commit 67d5f2b444
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -304,7 +304,7 @@ let
# !!! copy&pasted from upstart-jobs/filesystems.nix. # !!! copy&pasted from upstart-jobs/filesystems.nix.
mountPoints = mountPoints =
if fileSystems == null if fileSystems == []
then abort "You must specify the fileSystems option!" then abort "You must specify the fileSystems option!"
else map (fs: fs.mountPoint) fileSystems; else map (fs: fs.mountPoint) fileSystems;
devices = map (fs: if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fileSystems; devices = map (fs: if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fileSystems;

2
modules/tasks/filesystems.nix
View File

@ -69,7 +69,7 @@ in
<command>mkdir -p</command> . <command>mkdir -p</command> .
''; '';
type = types.nullOr (types.list types.optionSet); type = types.list types.optionSet;
options = { options = {