From c42d6c3fdbc031aacc16bdc0b7d27679296f391b Mon Sep 17 00:00:00 2001
From: Antoine Viallon <antoine@lesviallon.fr>
Date: Sat, 8 Apr 2023 19:37:36 +0200
Subject: [PATCH] [Filesystems] Fix udev rules being wrongly applied to
 partitions We only want block devices.

---
 filesystems.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/filesystems.nix b/filesystems.nix
index d812de5..d702ca4 100644
--- a/filesystems.nix
+++ b/filesystems.nix
@@ -76,16 +76,16 @@ in
 
     aviallon.filesystems.udevRules = mkBefore (concatLists [
       (optional (!(builtins.isNull cfg.hddScheduler))
-        ''ACTION!="remove", SUBSYSTEM=="block", KERNEL=="sd[a-z]*", ATTR{queue/rotational}=="1", ATTR{queue/scheduler}="${cfg.hddScheduler}"''
+        ''ACTION!="remove", SUBSYSTEM=="block", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="1", ATTR{queue/scheduler}="${cfg.hddScheduler}"''
       )
       (optional (!(builtins.isNull cfg.slowFlashScheduler))
         ''ACTION!="remove", SUBSYSTEM=="block", KERNEL=="sd[a-z]*|nvme[0-9]*n[0-9]*|mmcblk[0-9]*", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="${cfg.slowFlashScheduler}"''
       )
       (optional (!(builtins.isNull cfg.nvmeScheduler))
-        ''ACTION!="remove", SUBSYSTEM=="block", KERNEL=="nvme[0-9]*n[0-9]*", ATTR{queue/scheduler}="${cfg.nvmeScheduler}"''
+        ''ACTION!="remove", SUBSYSTEM=="block", KERNEL=="nvme[0-9]*n[0-9]", ATTR{queue/scheduler}="${cfg.nvmeScheduler}"''
       )
       (optional cfg.queuePriority
-        ''ACTION!="remove", SUBSYSTEM=="block", KERNEL=="sd[a-z]*", ATTR{device/ncq_prio_supported}=="1", ATTR{device/ncq_prio_enable}="1"''
+        ''ACTION!="remove", SUBSYSTEM=="block", KERNEL=="sd[a-z]", ATTR{device/ncq_prio_supported}=="1", ATTR{device/ncq_prio_enable}="1"''
       )
     ]);