technofab/disko
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/disko.git synced 2025-12-12 16:10:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

make device matching regexes a bit stricter

Browse source
This commit is contained in:
Jörg Thalheim 2022-11-15 19:30:09 +01:00
parent 5cbe8fbb48
commit d0fd785c93
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
types.nix
View file

@ -51,11 +51,11 @@ rec {
=> "/dev/disk/by-id/xxx-part2" => "/dev/disk/by-id/xxx-part2"
*/ */
deviceNumbering = dev: index: 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 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 "${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 "${dev}p${toString index}" # /dev/nvme0n1p1 style
else else
abort "${dev} seems not to be a supported disk format"; abort "${dev} seems not to be a supported disk format";