Include initrd mounts in the final system also

Without this, things like `RequiresMountsFor` do not work correctly during shutdown. See systemd/systemd#34327
WilliButz · Sep 9, 2024 · 3fae1ab · 3fae1ab
1 parent f58a36d
commit 3fae1ab
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib.nix b/lib.nix
@@ -247,8 +247,12 @@ rec {
     let
       allDirectories = getAllDirectories stateConfig;
       allFiles = getAllFiles stateConfig;
-      mountedDirectories = onlyBindMounts forInitrd allDirectories;
-      mountedFiles = onlyBindMounts forInitrd allFiles;
+      mountedDirectories =
+        onlyBindMounts forInitrd allDirectories
+        ++ lib.optionals (!forInitrd) (onlyBindMounts true allDirectories);
+      mountedFiles =
+        onlyBindMounts forInitrd allFiles
+        ++ lib.optionals (!forInitrd) (onlyBindMounts true allFiles);
 
       prefix = if forInitrd then "/sysroot" else "/";