summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorGuillaume Girol <symphorien@users.noreply.github.com>2021-05-23 12:18:14 +0000
committerGitHub <noreply@github.com>2021-05-23 12:18:14 +0000
commitd7555732bc8bb8a2acb50fd4ecba96c825b4f21e (patch)
treec27bf28533ff47535fa5d359f47c452da38f9714 /nixos/modules
parentdce902b14f4fb4816e1d616bd3c865e2e9518677 (diff)
parentef991f9b8bb4d69fe728d93d0caebc4c8b6d411a (diff)
downloadnixpkgs-d7555732bc8bb8a2acb50fd4ecba96c825b4f21e.tar
nixpkgs-d7555732bc8bb8a2acb50fd4ecba96c825b4f21e.tar.gz
nixpkgs-d7555732bc8bb8a2acb50fd4ecba96c825b4f21e.tar.bz2
nixpkgs-d7555732bc8bb8a2acb50fd4ecba96c825b4f21e.tar.lz
nixpkgs-d7555732bc8bb8a2acb50fd4ecba96c825b4f21e.tar.xz
nixpkgs-d7555732bc8bb8a2acb50fd4ecba96c825b4f21e.tar.zst
nixpkgs-d7555732bc8bb8a2acb50fd4ecba96c825b4f21e.zip
Merge pull request #123902 from hyperfekt/mount-pstore-quiet
nixos/filesystems: condition mount-pstore.service on unmounted /sys/fs/pstore
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/tasks/filesystems.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 24f71d29427..065d6cc95d1 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -321,6 +321,7 @@ in
             RemainAfterExit = true;
           };
           unitConfig = {
+            ConditionPathIsMountPoint = "!/sys/fs/pstore";
             ConditionVirtualization = "!container";
             DefaultDependencies = false; # needed to prevent a cycle
           };