commit be8e3128b906f09936f2eb2b1812acabb39c2907 · pyrox.dev/nixpkgs

+19 -13
nixos/modules/system/boot/loader/grub/install-grub.pl
···

       34
       34
        
       }

     

       35
       35
        
       

     

       36
       36
        
       sub readFile {

     

       37
       37
       -
           my ($fn) = @_; local $/ = undef;

     

       38
       38
       -
           open FILE, "<$fn" or return undef; my $s = <FILE>; close FILE;

     

       39
       39
       -
           local $/ = "\n"; chomp $s; return $s;

     

       37
       37
       +
           my ($fn) = @_;

     

       38
       38
       +
           # enable slurp mode: read entire file in one go

     

       39
       39
       +
           local $/ = undef;

     

       40
       40
       +
           open my $fh, "<$fn" or return undef;

     

       41
       41
       +
           my $s = <$fh>;

     

       42
       42
       +
           close $fh;

     

       43
       43
       +
           # disable slurp mode

     

       44
       44
       +
           local $/ = "\n";

     

       45
       45
       +
           chomp $s;

     

       46
       46
       +
           return $s;

     

       40
       47
        
       }

     

       41
       48
        
       

     

       42
       49
        
       sub writeFile {

     

       43
       50
        
           my ($fn, $s) = @_;

     

       44
       44
       -
           open FILE, ">$fn" or die "cannot create $fn: $!\n";

     

       45
       45
       -
           print FILE $s or die;

     

       46
       46
       -
           close FILE or die;

     

       51
       51
       +
           open my $fh, ">$fn" or die "cannot create $fn: $!\n";

     

       52
       52
       +
           print $fh $s or die "cannot write to $fn: $!\n";

     

       53
       53
       +
           close $fh or die "cannot close $fn: $!\n";

     

       47
       54
        
       }

     

       48
       55
        
       

     

       49
       56
        
       sub runCommand {

     

       50
       50
       -
           my ($cmd) = @_;

     

       51
       51
       -
           open FILE, "$cmd 2>/dev/null |" or die "Failed to execute: $cmd\n";

     

       52
       52
       -
           my @ret = <FILE>;

     

       53
       53
       -
           close FILE;

     

       57
       57
       +
           open(my $fh, "-|", @_) or die "Failed to execute: $@_\n";

     

       58
       58
       +
           my @ret = $fh->getlines();

     

       59
       59
       +
           close $fh;

     

       54
       60
        
           return ($?, @ret);

     

       55
       61
        
       }

     

       56
       62
        
       

     
···

       200
       206
        
                       $search = $types{$fsIdentifier} . ' ';

     

       201
       207
        
       

     

       202
       208
        
                       # Based on the type pull in the identifier from the system

     

       203
       203
       -
                       my ($status, @devInfo) = runCommand("@utillinux@/bin/blkid -o export @{[$fs->device]}");

     

       209
       209
       +
                       my ($status, @devInfo) = runCommand("@utillinux@/bin/blkid", "-o", "export", @{[$fs->device]});

     

       204
       210
        
                       if ($status != 0) {

     

       205
       211
        
                           die "Failed to get blkid info (returned $status) for @{[$fs->mount]} on @{[$fs->device]}";

     

       206
       212
        
                       }

     
···

       213
       219
        
       

     

       214
       220
        
                   # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes

     

       215
       221
        
                   if ($fs->type eq 'btrfs') {

     

       216
       216
       -
                       my ($status, @id_info) = runCommand("@btrfsprogs@/bin/btrfs subvol show @{[$fs->mount]}");

     

       222
       222
       +
                       my ($status, @id_info) = runCommand("@btrfsprogs@/bin/btrfs", "subvol", "show", @{[$fs->mount]});

     

       217
       223
        
                       if ($status != 0) {

     

       218
       224
        
                           die "Failed to retrieve subvolume info for @{[$fs->mount]}\n";

     

       219
       225
        
                       }

     
···

       221
       227
        
                       if ($#ids > 0) {

     

       222
       228
        
                           die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n"

     

       223
       229
        
                       } elsif ($#ids == 0) {

     

       224
       224
       -
                           my ($status, @path_info) = runCommand("@btrfsprogs@/bin/btrfs subvol list @{[$fs->mount]}");

     

       230
       230
       +
                           my ($status, @path_info) = runCommand("@btrfsprogs@/bin/btrfs", "subvol", "list", @{[$fs->mount]});

     

       225
       231
        
                           if ($status != 0) {

     

       226
       232
        
                               die "Failed to find @{[$fs->mount]} subvolume id from btrfs\n";

     

       227
       233
        
                           }