Unverified Commit aa6c8ae3 authored by Niklas Hambüchen's avatar Niklas Hambüchen Committed by GitHub
Browse files

Merge pull request #253488 from nh2/install-grub-dont-stat-network-fs 

install-grub.pl: Do stat() last to not hang on hanging network FS
parents 624b8aef b9ba9df3

nixos/modules/system/boot/loader/grub/install-grub.pl

+5 −1
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ sub GetFs { 
        chomp $fs;

        my @fields = split / /, $fs;

        my $mountPoint = $fields[4];

        next unless -d $mountPoint;

        my @mountOptions = split /,/, $fields[5];



        # Skip the optional fields.
@@ -155,6 +154,11 @@ sub GetFs { 


        # Is it better than our current match?

        if (length($mountPoint) > length($bestFs->mount)) {



            # -d performs a stat, which can hang forever on network file systems,

            # so we only make this call last, when it's likely that this is the mount point we need.

            next unless -d $mountPoint;



            $bestFs = Fs->new(device => $device, type => $fsType, mount => $mountPoint);

        }

    }