diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2022-11-15 19:30:09 +0100 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2022-11-15 19:30:09 +0100 |
commit | d0fd785c93e69adbf28c271cfce1e6a36eae9ec0 (patch) | |
tree | ae538a0ac3ae16e46d99f8871b45a10529153d03 | |
parent | 5cbe8fbb483f10d717e26c608524ce442802cb37 (diff) |
make device matching regexes a bit stricter
-rw-r--r-- | types.nix | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -51,11 +51,11 @@ rec { => "/dev/disk/by-id/xxx-part2" */ deviceNumbering = dev: index: - if match "/dev/[vs]d.*" dev != null then + if match "/dev/[vs]d.+" dev != null then dev + toString index # /dev/{s,v}da style - else if match "/dev/disk/.*" dev != null then + else if match "/dev/disk/.+" dev != null then "${dev}-part${toString index}" # /dev/disk/by-id/xxx style - else if match "/dev/(nvme|md/|mmcblk).*" dev != null then + else if match "/dev/(nvme|md/|mmcblk).+" dev != null then "${dev}p${toString index}" # /dev/nvme0n1p1 style else abort "${dev} seems not to be a supported disk format"; |