1 files changed, 17 insertions, 1 deletions

diff --git a/systems/zoldene/virtualisation.nix b/systems/zoldene/virtualisation.nix
index d2212fe..424f43f 100644
--- a/systems/zoldene/virtualisation.nix
+++ b/systems/zoldene/virtualisation.nix
@@ -6,6 +6,14 @@
   virtualisation.docker.enable = true;
   disko.devices.zpool.zfast.datasets."root/persist/var/lib/docker" =
     { type = "zfs_fs"; mountpoint = "/persist/zfast/var/lib/docker"; options.mountpoint = "legacy"; };
+  systemd.services.docker.after = [
+    "var-lib-docker.mount"
+    "persist-zfast-var-lib-docker.mount"
+  ];
+  systemd.services.docker.unitConfig.BindsTo = [
+    "var-lib-docker.mount"
+    "persist-zfast-var-lib-docker.mount"
+  ];
 
   ### Enable LXC
   disko.devices.zpool.zfast.datasets."root/persist/var/lib/lxc" =
@@ -14,12 +22,21 @@
     enable = true;
     lxcfs.enable = true;
   };
+  systemd.services.lxc.after = [
+    "var-lib-lxc.mount"
+    "persist-zfast-var-lib-lxc.mount"
+  ];
+  systemd.services.lxc.unitConfig.BindsTo = [
+    "var-lib-lxc.mount"
+    "persist-zfast-var-lib-lxc.mount"
+  ];
 
   ### Enable libvirtd
   virtualisation.libvirtd = {
     enable = true;
     qemu.package = pkgs-no-overlay.qemu;
   };
+  # No persistence for libvirtd: config is supposed to be persisted via config
 
   ### Persistence for LXC / Docker
   environment.persistence."/persist/zfast".directories = [
@@ -43,4 +60,3 @@
     "net.ipv4.conf.default.forwarding" = true;
   };
 }
-