Author: eelco
Date: Mon May 14 01:33:11 2012
New Revision: 34080
URL: https://nixos.org/websvn/nix/?rev=34080&sc=1
Log:
* Require fileSystems to be set.
Modified:
nixos/trunk/modules/system/boot/stage-1.nix
nixos/trunk/modules/tasks/filesystems.nix
Modified: nixos/trunk/modules/system/boot/stage-1.nix
==============================================================================
--- nixos/trunk/modules/system/boot/stage-1.nix Sun May 13 19:10:57 2012
(r34079)
+++ nixos/trunk/modules/system/boot/stage-1.nix Mon May 14 01:33:11 2012
(r34080)
@@ -304,7 +304,7 @@
# !!! copy&pasted from upstart-jobs/filesystems.nix.
mountPoints =
- if fileSystems == null
+ if fileSystems == []
then abort "You must specify the fileSystems option!"
else map (fs: fs.mountPoint) fileSystems;
devices = map (fs: if fs.device != null then fs.device else
"/dev/disk/by-label/${fs.label}") fileSystems;
Modified: nixos/trunk/modules/tasks/filesystems.nix
==============================================================================
--- nixos/trunk/modules/tasks/filesystems.nix Sun May 13 19:10:57 2012
(r34079)
+++ nixos/trunk/modules/tasks/filesystems.nix Mon May 14 01:33:11 2012
(r34080)
@@ -69,7 +69,7 @@
<command>mkdir -p</command> .
'';
- type = types.nullOr (types.list types.optionSet);
+ type = types.list types.optionSet;
options = {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
