From f49536f0042084184bf0aabbff84c708a0e22041 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sat, 28 Jan 2023 16:52:04 +0100
Subject: [PATCH] types.table: get device mountOptions the correct way

---
 types.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/types.nix b/types.nix
index fb90399..0d759e0 100644
--- a/types.nix
+++ b/types.nix
@@ -211,7 +211,7 @@ rec {
     in ''
       set -efux
       # first create the necessary devices
-      ${concatMapStrings (dev: ((attrByPath (dev ++ [ "_mount" ]) "" devices) {}).dev or "") sortedDeviceList}
+      ${concatMapStrings (dev: ((attrByPath (dev ++ [ "_mount" ]) {} devices) {}).dev or "") sortedDeviceList}
 
       # and then mount the filesystems in alphabetical order
       ${concatStrings (attrValues fsMounts)}
@@ -680,9 +680,7 @@ rec {
           let
             partMounts = diskoLib.deepMergeMap (partition: partition._mount {inherit dev;}) config.partitions;
           in {
-            dev = ''
-              ${concatMapStrings (x: x.dev or "") (attrValues partMounts)}
-            '';
+            dev = partMounts.dev or "";
             fs = partMounts.fs or {};
         };
       };