···

       
425
       
425
       
 
       
        { path = "/boot"; inherit (cfg) devices; inherit (efi) efiSysMountPoint; }

     

       
426
       
426
       
 
       
      ];

     

       
427
       
427
       
 
       


     

       
428
       
428
       
-
       
      system.build.installBootLoader = pkgs.writeScript "install-grub.sh" (''

     

       
428
       
428
       
+
       
      system.build.installBootLoader =

     

       
429
       
429
       
+
       
        let

     

       
430
       
430
       
+
       
          install-grub-pl = pkgs.substituteAll {

     

       
431
       
431
       
+
       
            src = ./install-grub.pl;

     

       
432
       
432
       
+
       
            inherit (pkgs) utillinux;

     

       
433
       
433
       
+
       
            btrfsprogs = pkgs.btrfs-progs;

     

       
434
       
434
       
+
       
          };

     

       
435
       
435
       
+
       
        in pkgs.writeScript "install-grub.sh" (''

     

       
429
       
436
       
 
       
        #!${pkgs.stdenv.shell}

     

       
430
       
437
       
 
       
        set -e

     

       
431
       
438
       
 
       
        export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX ListCompare ])}

     

       
432
       
439
       
 
       
        ${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"}

     

       
433
       
440
       
 
       
      '' + flip concatMapStrings cfg.mirroredBoots (args: ''

     

       
434
       
434
       
-
       
        ${pkgs.perl}/bin/perl ${./install-grub.pl} ${grubConfig args} $@

     

       
441
       
441
       
+
       
        ${pkgs.perl}/bin/perl ${install-grub-pl} ${grubConfig args} $@

     

       
435
       
442
       
 
       
      ''));

     

       
436
       
443
       
 
       


     

       
437
       
444
       
 
       
      system.build.grub = grub;

     

···

       
176
       
176
       
 
       
                $search = $types{$fsIdentifier} . ' ';

     

       
177
       
177
       
 
       


     

       
178
       
178
       
 
       
                # Based on the type pull in the identifier from the system

     

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

     

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

     

       
180
       
180
       
 
       
                if ($status != 0) {

     

       
181
       
181
       
 
       
                    die "Failed to get blkid info for @{[$fs->mount]} on @{[$fs->device]}";

     

       
182
       
182
       
 
       
                }

     
···

       
189
       
189
       
 
       


     

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

     

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

     

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

     

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

     

       
193
       
193
       
 
       
                if ($status != 0) {

     

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

     

       
195
       
195
       
 
       
                }

     
···

       
197
       
197
       
 
       
                if ($#ids > 0) {

     

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

     

       
199
       
199
       
 
       
                } elsif ($#ids == 0) {

     

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

     

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

     

       
201
       
201
       
 
       
                    if ($status != 0) {

     

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

     

       
203
       
203
       
 
       
                    }