From e379d1214e2627648a6228dd959b85fee7295ee4 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Sun, 28 Mar 2021 14:59:32 +0200
Subject: [PATCH] nixos: normalize eris_rom declaration

---
 nixos-modules/eris/cached_fs_rom.dhall |  1 -
 nixos-modules/eris/default.nix         | 10 +++++++++-
 nixos-modules/eris/rom-fs.nix          |  5 -----
 nixos-modules/eris/rom-memory.nix      |  5 -----
 nixos-modules/eris/rom-vfs.dhall       |  2 +-
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/nixos-modules/eris/cached_fs_rom.dhall b/nixos-modules/eris/cached_fs_rom.dhall
index 0fc9366..e616c8c 100644
--- a/nixos-modules/eris/cached_fs_rom.dhall
+++ b/nixos-modules/eris/cached_fs_rom.dhall
@@ -19,7 +19,6 @@ in  λ(binary : Text) →
               , label =
                   Init.LabelSelector.Type.Partial
                     { prefix = Some "nixos -> ", suffix = None Text }
-              , attributes = toMap { directory = "/eris" }
               }
             ]
           }
diff --git a/nixos-modules/eris/default.nix b/nixos-modules/eris/default.nix
index d384fc4..1941c56 100644
--- a/nixos-modules/eris/default.nix
+++ b/nixos-modules/eris/default.nix
@@ -1 +1,9 @@
-{ imports = [ ./rom-fs.nix ./rom-memory.nix ]; }
+{ pkgs, ... }: {
+  imports = [ ./rom-fs.nix ./rom-memory.nix ];
+
+  genode.core.children.eris_rom = {
+    package = pkgs.genodePackages.cached_fs_rom;
+    configFile = ./cached_fs_rom.dhall;
+  };
+
+}
diff --git a/nixos-modules/eris/rom-fs.nix b/nixos-modules/eris/rom-fs.nix
index 9d2143e..9e67697 100644
--- a/nixos-modules/eris/rom-fs.nix
+++ b/nixos-modules/eris/rom-fs.nix
@@ -25,11 +25,6 @@
       '';
     };
 
-    genode.core.children.eris_rom = {
-      package = pkgs.genodePackages.cached_fs_rom;
-      configFile = ./cached_fs_rom.dhall;
-    };
-
   };
 
 }
diff --git a/nixos-modules/eris/rom-memory.nix b/nixos-modules/eris/rom-memory.nix
index 562b1f3..c8e7721 100644
--- a/nixos-modules/eris/rom-memory.nix
+++ b/nixos-modules/eris/rom-memory.nix
@@ -26,11 +26,6 @@
       '';
     };
 
-    genode.core.children.eris_rom = {
-      package = pkgs.genodePackages.cached_fs_rom;
-      configFile = ./cached_fs_rom.dhall;
-    };
-
   };
 
 }
diff --git a/nixos-modules/eris/rom-vfs.dhall b/nixos-modules/eris/rom-vfs.dhall
index 389bbf9..1217817 100644
--- a/nixos-modules/eris/rom-vfs.dhall
+++ b/nixos-modules/eris/rom-vfs.dhall
@@ -18,7 +18,7 @@ in  λ(partitionType : Text) →
             [ Init.Config.Policy::{
               , service = "File_system"
               , label = Init.LabelSelector.prefix "eris_rom"
-              , attributes = toMap { root = "/" }
+              , attributes = toMap { root = "/eris" }
               }
             ]
           }