Unverified Commit cf51b44a authored by Will Fancher's avatar Will Fancher Committed by GitHub
Browse files

nixos-generate-config: prefer `/dev/mapper` paths for mounts (#424814)

parents 4ec04b53 8115e2b0

nixos/modules/installer/tools/nixos-generate-config.pl

+6 −1
Original line number Diff line number Diff line
@@ -344,7 +344,12 @@ sub findStableDevPath { 


    my $st = stat($dev) or return $dev;



    foreach my $dev2 (glob("/dev/stratis/*/*"), glob("/dev/disk/by-uuid/*"), glob("/dev/mapper/*"), glob("/dev/disk/by-label/*")) {

    foreach my $dev2 (

        glob("/dev/stratis/*/*"),

        glob("/dev/mapper/*"),

        glob("/dev/disk/by-uuid/*"),

        glob("/dev/disk/by-label/*"),

    ) {

        my $st2 = stat($dev2) or next;

        return $dev2 if $st->rdev == $st2->rdev;

    }