fix(zfs): Use filesystems to import the pools
All checks were successful
Check meta / check_meta (pull_request) Successful in 13s
Check meta / check_dns (pull_request) Successful in 16s
Check workflows / check_workflows (pull_request) Successful in 16s
Build all the nodes / Jaccess04 (pull_request) Successful in 21s
Build all the nodes / Jaccess01 (pull_request) Successful in 23s
Run pre-commit on all files / pre-commit (pull_request) Successful in 31s
Build all the nodes / ap01 (pull_request) Successful in 37s
Build all the nodes / bridge01 (pull_request) Successful in 43s
Build all the nodes / build01 (pull_request) Successful in 44s
Build all the nodes / geo01 (pull_request) Successful in 44s
Build all the nodes / cof02 (pull_request) Successful in 53s
Build all the nodes / geo02 (pull_request) Successful in 52s
Build all the nodes / hypervisor01 (pull_request) Successful in 53s
Build all the nodes / compute01 (pull_request) Successful in 1m16s
Build all the nodes / hypervisor02 (pull_request) Successful in 49s
Build all the nodes / hypervisor03 (pull_request) Successful in 43s
Build all the nodes / netcore01 (pull_request) Successful in 20s
Build all the nodes / lab-router01 (pull_request) Successful in 43s
Build all the nodes / iso (pull_request) Successful in 55s
Build all the nodes / netcore02 (pull_request) Successful in 28s
Build all the nodes / krz01 (pull_request) Successful in 1m7s
Build all the nodes / storage01 (pull_request) Successful in 51s
Build all the nodes / rescue01 (pull_request) Successful in 58s
Build all the nodes / tower01 (pull_request) Successful in 46s
Build all the nodes / web02 (pull_request) Successful in 51s
Build all the nodes / vault01 (pull_request) Successful in 56s
Build the shell / build-shell (pull_request) Successful in 22s
Build all the nodes / web01 (pull_request) Successful in 1m5s
Build all the nodes / web03 (pull_request) Successful in 51s
Build all the nodes / zulip01 (pull_request) Successful in 53s
Build all the nodes / Jaccess04 (push) Successful in 21s
Run pre-commit on all files / pre-commit (push) Successful in 29s
Build all the nodes / Jaccess01 (push) Successful in 34s
Build all the nodes / bridge01 (push) Successful in 45s
Build all the nodes / ap01 (push) Successful in 50s
Build all the nodes / hypervisor02 (push) Successful in 49s
Build all the nodes / geo02 (push) Successful in 51s
Build all the nodes / cof02 (push) Successful in 52s
Build all the nodes / geo01 (push) Successful in 1m1s
Build all the nodes / hypervisor01 (push) Successful in 1m1s
Build all the nodes / hypervisor03 (push) Successful in 1m0s
Build all the nodes / build01 (push) Successful in 1m3s
Build all the nodes / netcore01 (push) Successful in 21s
Build all the nodes / netcore02 (push) Successful in 21s
Build all the nodes / iso (push) Successful in 59s
Build all the nodes / compute01 (push) Successful in 1m23s
Build all the nodes / lab-router01 (push) Successful in 48s
Build all the nodes / krz01 (push) Successful in 1m10s
Build the shell / build-shell (push) Successful in 23s
Build all the nodes / tower01 (push) Successful in 46s
Build all the nodes / rescue01 (push) Successful in 57s
Build all the nodes / vault01 (push) Successful in 55s
Build all the nodes / web02 (push) Successful in 50s
Build all the nodes / storage01 (push) Successful in 1m2s
Build all the nodes / zulip01 (push) Successful in 48s
Build all the nodes / web03 (push) Successful in 55s
Build all the nodes / web01 (push) Successful in 1m14s
All checks were successful
Check meta / check_meta (pull_request) Successful in 13s
Check meta / check_dns (pull_request) Successful in 16s
Check workflows / check_workflows (pull_request) Successful in 16s
Build all the nodes / Jaccess04 (pull_request) Successful in 21s
Build all the nodes / Jaccess01 (pull_request) Successful in 23s
Run pre-commit on all files / pre-commit (pull_request) Successful in 31s
Build all the nodes / ap01 (pull_request) Successful in 37s
Build all the nodes / bridge01 (pull_request) Successful in 43s
Build all the nodes / build01 (pull_request) Successful in 44s
Build all the nodes / geo01 (pull_request) Successful in 44s
Build all the nodes / cof02 (pull_request) Successful in 53s
Build all the nodes / geo02 (pull_request) Successful in 52s
Build all the nodes / hypervisor01 (pull_request) Successful in 53s
Build all the nodes / compute01 (pull_request) Successful in 1m16s
Build all the nodes / hypervisor02 (pull_request) Successful in 49s
Build all the nodes / hypervisor03 (pull_request) Successful in 43s
Build all the nodes / netcore01 (pull_request) Successful in 20s
Build all the nodes / lab-router01 (pull_request) Successful in 43s
Build all the nodes / iso (pull_request) Successful in 55s
Build all the nodes / netcore02 (pull_request) Successful in 28s
Build all the nodes / krz01 (pull_request) Successful in 1m7s
Build all the nodes / storage01 (pull_request) Successful in 51s
Build all the nodes / rescue01 (pull_request) Successful in 58s
Build all the nodes / tower01 (pull_request) Successful in 46s
Build all the nodes / web02 (pull_request) Successful in 51s
Build all the nodes / vault01 (pull_request) Successful in 56s
Build the shell / build-shell (pull_request) Successful in 22s
Build all the nodes / web01 (pull_request) Successful in 1m5s
Build all the nodes / web03 (pull_request) Successful in 51s
Build all the nodes / zulip01 (pull_request) Successful in 53s
Build all the nodes / Jaccess04 (push) Successful in 21s
Run pre-commit on all files / pre-commit (push) Successful in 29s
Build all the nodes / Jaccess01 (push) Successful in 34s
Build all the nodes / bridge01 (push) Successful in 45s
Build all the nodes / ap01 (push) Successful in 50s
Build all the nodes / hypervisor02 (push) Successful in 49s
Build all the nodes / geo02 (push) Successful in 51s
Build all the nodes / cof02 (push) Successful in 52s
Build all the nodes / geo01 (push) Successful in 1m1s
Build all the nodes / hypervisor01 (push) Successful in 1m1s
Build all the nodes / hypervisor03 (push) Successful in 1m0s
Build all the nodes / build01 (push) Successful in 1m3s
Build all the nodes / netcore01 (push) Successful in 21s
Build all the nodes / netcore02 (push) Successful in 21s
Build all the nodes / iso (push) Successful in 59s
Build all the nodes / compute01 (push) Successful in 1m23s
Build all the nodes / lab-router01 (push) Successful in 48s
Build all the nodes / krz01 (push) Successful in 1m10s
Build the shell / build-shell (push) Successful in 23s
Build all the nodes / tower01 (push) Successful in 46s
Build all the nodes / rescue01 (push) Successful in 57s
Build all the nodes / vault01 (push) Successful in 55s
Build all the nodes / web02 (push) Successful in 50s
Build all the nodes / storage01 (push) Successful in 1m2s
Build all the nodes / zulip01 (push) Successful in 48s
Build all the nodes / web03 (push) Successful in 55s
Build all the nodes / web01 (push) Successful in 1m14s
This fixes dependencies issues when using fileSystems for bind mounting directories onto the ZFS pools
This commit is contained in:
parent
2329adc1c2
commit
40b2c848e5
3 changed files with 52 additions and 14 deletions
|
@ -19,15 +19,33 @@
|
|||
kernelModules = [ "kvm-intel" ];
|
||||
};
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/c83f6978-fd26-44a8-a86a-b0e971bb0c8c";
|
||||
fsType = "ext4";
|
||||
fileSystems = {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-uuid/c83f6978-fd26-44a8-a86a-b0e971bb0c8c";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-uuid/55DB-056F";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
# ZFS Pools
|
||||
"/data/slow" = {
|
||||
device = "work01";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
"/data/fast" = {
|
||||
device = "fast01";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/55DB-056F";
|
||||
fsType = "vfat";
|
||||
};
|
||||
# Use fileSystems for managing imports
|
||||
systemd.services.zfs-mount.enable = false;
|
||||
|
||||
swapDevices = [ { device = "/dev/disk/by-uuid/edbb5acc-84fc-4a2f-9f1b-086eb137d6dc"; } ];
|
||||
}
|
||||
|
|
|
@ -19,15 +19,32 @@
|
|||
kernelModules = [ "kvm-intel" ];
|
||||
};
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/278cb2a2-47b9-4ec5-8b68-a5a6d037d59e";
|
||||
fsType = "ext4";
|
||||
fileSystems = {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-uuid/278cb2a2-47b9-4ec5-8b68-a5a6d037d59e";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-uuid/8BD2-C908";
|
||||
fsType = "vfat";
|
||||
};
|
||||
# ZFS Pools
|
||||
"/data/slow" = {
|
||||
device = "work01";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
|
||||
"/data/fast" = {
|
||||
device = "fast01";
|
||||
fsType = "zfs";
|
||||
options = [ "zfsutil" ];
|
||||
};
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/8BD2-C908";
|
||||
fsType = "vfat";
|
||||
};
|
||||
# Use fileSystems for managing imports
|
||||
systemd.services.zfs-mount.enable = false;
|
||||
|
||||
swapDevices = [ { device = "/dev/disk/by-uuid/65a6f6e4-e996-4718-a4d0-cd0c78dcb15b"; } ];
|
||||
}
|
||||
|
|
|
@ -115,6 +115,9 @@
|
|||
};
|
||||
};
|
||||
|
||||
# Use fileSystems for managing imports
|
||||
systemd.services.zfs-mount.enable = false;
|
||||
|
||||
swapDevices = [
|
||||
{ device = "/dev/disk/by-uuid/7614fa12-c6a7-456e-9620-eb9c0e025140"; }
|
||||
{ device = "/dev/disk/by-uuid/eb0aef44-b264-4f94-b847-3ad5dcc19ffd"; }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue