[Nix-dev] [Nix-commits] SVN commit: nix - r34080 - in nixos/trunk/modules: system/boot tasks

Nicolas Pierron nicolas.b.pierron at gmail.com
Mon May 14 20:40:23 CEST 2012


On Sun, May 13, 2012 at 6:33 PM, Eelco Dolstra <e.dolstra at tudelft.nl> wrote:
> Log:
> * Require fileSystems to be set.
>
> 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;

Using the assertions option should be better instead of having an abort.

-- 
Nicolas Pierron
http://www.linkedin.com/in/nicolasbpierron - http://nbp.name/


More information about the nix-dev mailing list