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
This commit is contained in:
parent
33b3a33f51
commit
38c401b6e7
2 changed files with 13 additions and 13 deletions
|
@ -37,18 +37,18 @@ in
|
||||||
environment.systemPackages =
|
environment.systemPackages =
|
||||||
let
|
let
|
||||||
|
|
||||||
ssh = mapAttrsToList
|
sshTor = mapAttrsToList
|
||||||
(name:
|
(name:
|
||||||
{ onionId, ... }:
|
{ 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
|
${pkgs.tor}/bin/torify ${pkgs.openssh}/bin/ssh root@${onionId} -p 2222
|
||||||
'')
|
'')
|
||||||
computers;
|
computers;
|
||||||
|
|
||||||
password = mapAttrsToList
|
passwordTor = mapAttrsToList
|
||||||
(name:
|
(name:
|
||||||
{ onionId, ... }:
|
{ 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 '
|
${pkgs.tor}/bin/torify ${pkgs.openssh}/bin/ssh root@${onionId} -p 2222 '
|
||||||
echo -n "enter password : "
|
echo -n "enter password : "
|
||||||
read password
|
read password
|
||||||
|
@ -58,6 +58,6 @@ in
|
||||||
computers;
|
computers;
|
||||||
|
|
||||||
in
|
in
|
||||||
ssh ++ password;
|
sshTor ++ passwordTor;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -85,16 +85,16 @@ in
|
||||||
|
|
||||||
zroot = {
|
zroot = {
|
||||||
type = "zpool";
|
type = "zpool";
|
||||||
#rootFsOptions = {
|
rootFsOptions = {
|
||||||
#mountpoint = "none";
|
mountpoint = "none";
|
||||||
#canmount = "off";
|
canmount = "off";
|
||||||
#};
|
};
|
||||||
datasets = {
|
datasets = {
|
||||||
"root" = {
|
"root" = {
|
||||||
type = "zfs_fs";
|
type = "zfs_fs";
|
||||||
mountpoint = "/";
|
mountpoint = "/";
|
||||||
options = {
|
options = {
|
||||||
mountpoint = "/";
|
mountpoint = "legacy";
|
||||||
compression = "lz4";
|
compression = "lz4";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -115,7 +115,7 @@ in
|
||||||
type = "zfs_fs";
|
type = "zfs_fs";
|
||||||
mountpoint = "/media";
|
mountpoint = "/media";
|
||||||
options = {
|
options = {
|
||||||
mountpoint = "/media";
|
mountpoint = "legacy";
|
||||||
compression = "lz4";
|
compression = "lz4";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -123,7 +123,7 @@ in
|
||||||
type = "zfs_fs";
|
type = "zfs_fs";
|
||||||
mountpoint = "/nextcloud";
|
mountpoint = "/nextcloud";
|
||||||
options = {
|
options = {
|
||||||
mountpoint = "/nextcloud";
|
mountpoint = "legacy";
|
||||||
compression = "lz4";
|
compression = "lz4";
|
||||||
"com.sun:auto-snapshot" = "false";
|
"com.sun:auto-snapshot" = "false";
|
||||||
"com.sun:auto-snapshot:daily" = "true,keep=32";
|
"com.sun:auto-snapshot:daily" = "true,keep=32";
|
||||||
|
@ -134,7 +134,7 @@ in
|
||||||
type = "zfs_fs";
|
type = "zfs_fs";
|
||||||
mountpoint = "/borg";
|
mountpoint = "/borg";
|
||||||
options = {
|
options = {
|
||||||
mountpoint = "/borg";
|
mountpoint = "legacy";
|
||||||
compression = "lz4";
|
compression = "lz4";
|
||||||
"com.sun:auto-snapshot" = "false";
|
"com.sun:auto-snapshot" = "false";
|
||||||
"com.sun:auto-snapshot:daily" = "true,keep=32";
|
"com.sun:auto-snapshot:daily" = "true,keep=32";
|
||||||
|
|
Loading…
Reference in a new issue