nixos-modules/microvm/mounts: add fix for hanging qemu shutdown

Thanks to @thkoch2001 for debugging work ad for this suggestion. Fixes Github issue #170
astro · Dec 20, 2023 · 736d43a · 736d43a
1 parent 21d285d
commit 736d43a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/nixos-modules/microvm/mounts.nix b/nixos-modules/microvm/mounts.nix
@@ -146,4 +146,13 @@ lib.mkIf config.microvm.guest.enable {
       };
     };
   };
+
+  # Fix for hanging shutdown
+  systemd.mounts = lib.mkIf config.boot.initrd.systemd.enable [ {
+    what = "store";
+    where = "/nix/store";
+    # Generate a `nix-store.mount.d/overrides.conf`
+    overrideStrategy = "asDropin";
+    unitConfig.DefaultDependencies = false;
+  } ];
 }
diff --git a/nixos-modules/microvm/optimization.nix b/nixos-modules/microvm/optimization.nix
@@ -49,6 +49,7 @@ in
     # TODO: error mounting /nix/store on crosvm, kvmtool
     boot.initrd.systemd.enable = lib.mkDefault (
       builtins.elem cfg.hypervisor [
+        "qemu"
         "cloud-hypervisor"
         "firecracker"
         "stratovirt"