From d0b196a78efcf3b38ccc414654c7c95c5e1ae678 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 29 Jun 2015 19:37:25 +0200
Subject: machines: Remove /boot options from ISO images.

We can't really do a "mkForce {}" or "mkForce null" on the submodule
type and the upstream module throws an error on null values, so we
simply define a dummy fileSystem with the noauto option set.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 machines/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'machines/default.nix')

diff --git a/machines/default.nix b/machines/default.nix
index 54b70321..d1373ee9 100644
--- a/machines/default.nix
+++ b/machines/default.nix
@@ -23,7 +23,13 @@ let
           boot = bootcfg // lib.optionalAttrs (bootcfg ? loader) {
             loader = lib.mkForce bootcfg.loader;
           };
-          fileSystems = lib.mapAttrs (lib.const lib.mkForce) fscfg;
+          fileSystems = lib.mapAttrs (lib.const lib.mkForce) fscfg // {
+            "/boot" = lib.mkForce (fscfg."/boot" or {
+              device = "none";
+              fsType = "none";
+              options = "noauto";
+            });
+          };
         };
       };
     in import "${nixpkgs}/nixos/lib/eval-config.nix" {
-- 
cgit 1.4.1