From 38c401b6e77663ef4b68f60653fdb33a3ff5fde3 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Sun, 30 Apr 2023 09:58:49 +0200
Subject: [PATCH] use zfs legacy mount, because it boots better.

This appeared during boot time, and needed manual interference using Ctrl-D
zfs_mount_at() failed: mountpoint or dataset is busy
---
 .../network/sshd/known-hosts-bootup.nix          | 10 +++++-----
 nixos/machines/chungus/disko-config.nix          | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/nixos/components/network/sshd/known-hosts-bootup.nix b/nixos/components/network/sshd/known-hosts-bootup.nix
index 7b9231e..cfe91af 100644
--- a/nixos/components/network/sshd/known-hosts-bootup.nix
+++ b/nixos/components/network/sshd/known-hosts-bootup.nix
@@ -37,18 +37,18 @@ in
   environment.systemPackages =
     let
 
-      ssh = mapAttrsToList
+      sshTor = mapAttrsToList
         (name:
           { onionId, ... }:
-          pkgs.writers.writeDashBin "ssh-boot-to-${name}" ''
+          pkgs.writers.writeDashBin "ssh-boot-to-${name}-via-tor" ''
             ${pkgs.tor}/bin/torify ${pkgs.openssh}/bin/ssh root@${onionId} -p 2222
           '')
         computers;
 
-      password = mapAttrsToList
+      passwordTor = mapAttrsToList
         (name:
           { onionId, ... }:
-          pkgs.writers.writeDashBin "unlock-boot-${name}" ''
+          pkgs.writers.writeDashBin "unlock-boot-${name}-via-tor" ''
             ${pkgs.tor}/bin/torify ${pkgs.openssh}/bin/ssh root@${onionId} -p 2222 '
             echo -n "enter password : "
             read password
@@ -58,6 +58,6 @@ in
         computers;
 
     in
-    ssh ++ password;
+    sshTor ++ passwordTor;
 
 }
diff --git a/nixos/machines/chungus/disko-config.nix b/nixos/machines/chungus/disko-config.nix
index d65e5ff..c32fe36 100644
--- a/nixos/machines/chungus/disko-config.nix
+++ b/nixos/machines/chungus/disko-config.nix
@@ -85,16 +85,16 @@ in
 
       zroot = {
         type = "zpool";
-        #rootFsOptions = {
-        #mountpoint = "none";
-        #canmount = "off";
-        #};
+        rootFsOptions = {
+          mountpoint = "none";
+          canmount = "off";
+        };
         datasets = {
           "root" = {
             type = "zfs_fs";
             mountpoint = "/";
             options = {
-              mountpoint = "/";
+              mountpoint = "legacy";
               compression = "lz4";
             };
           };
@@ -115,7 +115,7 @@ in
             type = "zfs_fs";
             mountpoint = "/media";
             options = {
-              mountpoint = "/media";
+              mountpoint = "legacy";
               compression = "lz4";
             };
           };
@@ -123,7 +123,7 @@ in
             type = "zfs_fs";
             mountpoint = "/nextcloud";
             options = {
-              mountpoint = "/nextcloud";
+              mountpoint = "legacy";
               compression = "lz4";
               "com.sun:auto-snapshot" = "false";
               "com.sun:auto-snapshot:daily" = "true,keep=32";
@@ -134,7 +134,7 @@ in
             type = "zfs_fs";
             mountpoint = "/borg";
             options = {
-              mountpoint = "/borg";
+              mountpoint = "legacy";
               compression = "lz4";
               "com.sun:auto-snapshot" = "false";
               "com.sun:auto-snapshot:daily" = "true,keep=32";