commit 9dddd48c4c744ad478e20e8967006c5f32474a54 · pyrox.dev/nixpkgs

+26

nixos/modules/system/boot/loader/grub/grub.nix

···

       44
       44
        
           { splashImage = f cfg.splashImage;

     

       45
       45
        
             splashMode = f cfg.splashMode;

     

       46
       46
        
             backgroundColor = f cfg.backgroundColor;

     

       47
       47
       +
             entryOptions = f cfg.entryOptions;

     

       48
       48
       +
             subEntryOptions = f cfg.subEntryOptions;

     

       47
       49
        
             grub = f grub;

     

       48
       50
        
             grubTarget = f (grub.grubTarget or "");

     

       49
       51
        
             shell = "${pkgs.runtimeShell}";

     
···

       441
       443
        
               default = null;

     

       442
       444
        
               description = ''

     

       443
       445
        
                 Background color to be used for GRUB to fill the areas the image isn't filling.

     

       446
       446
       +
       

     

       447
       447
       +
                 <note><para>

     

       448
       448
       +
                 This options has no effect for GRUB 1.

     

       449
       449
       +
                 </para></note>

     

       450
       450
       +
               '';

     

       451
       451
       +
             };

     

       452
       452
       +
       

     

       453
       453
       +
             entryOptions = mkOption {

     

       454
       454
       +
               default = "--class nixos --unrestricted";

     

       455
       455
       +
               type = types.nullOr types.str;

     

       456
       456
       +
               description = ''

     

       457
       457
       +
                 Options applied to the primary NixOS menu entry.

     

       458
       458
       +
       

     

       459
       459
       +
                 <note><para>

     

       460
       460
       +
                 This options has no effect for GRUB 1.

     

       461
       461
       +
                 </para></note>

     

       462
       462
       +
               '';

     

       463
       463
       +
             };

     

       464
       464
       +
       

     

       465
       465
       +
             subEntryOptions = mkOption {

     

       466
       466
       +
               default = "--class nixos";

     

       467
       467
       +
               type = types.nullOr types.str;

     

       468
       468
       +
               description = ''

     

       469
       469
       +
                 Options applied to the secondary NixOS submenu entry.

     

       444
       470
        
       

     

       445
       471
        
                 <note><para>

     

       446
       472
        
                 This options has no effect for GRUB 1.

+5 -3

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

···

       64
       64
        
       my $extraEntriesBeforeNixOS = get("extraEntriesBeforeNixOS") eq "true";

     

       65
       65
        
       my $splashImage = get("splashImage");

     

       66
       66
        
       my $splashMode = get("splashMode");

     

       67
       67
       +
       my $entryOptions = get("entryOptions");

     

       68
       68
       +
       my $subEntryOptions = get("subEntryOptions");

     

       67
       69
        
       my $backgroundColor = get("backgroundColor");

     

       68
       70
        
       my $configurationLimit = int(get("configurationLimit"));

     

       69
       71
        
       my $copyKernels = get("copyKernels") eq "true";

     
···

       509
       511
        
       # Add default entries.

     

       510
       512
        
       $conf .= "$extraEntries\n" if $extraEntriesBeforeNixOS;

     

       511
       513
        
       

     

       512
       512
       -
       addEntry("NixOS - Default", $defaultConfig, "--unrestricted");

     

       514
       514
       +
       addEntry("NixOS - Default", $defaultConfig, $entryOptions);

     

       513
       515
        
       

     

       514
       516
        
       $conf .= "$extraEntries\n" unless $extraEntriesBeforeNixOS;

     

       515
       517
        
       

     
···

       546
       548
        
           my ($profile, $description) = @_;

     

       547
       549
        
       

     

       548
       550
        
           # Add entries for all generations of this profile.

     

       549
       549
       -
           $conf .= "submenu \"$description\" {\n" if $grubVersion == 2;

     

       551
       551
       +
           $conf .= "submenu \"$description\" --class submenu {\n" if $grubVersion == 2;

     

       550
       552
        
       

     

       551
       553
        
           sub nrFromGen { my ($x) = @_; $x =~ /\/\w+-(\d+)-link/; return $1; }

     

       552
       554
        
       

     
···

       566
       568
        
                   -e "$link/nixos-version"

     

       567
       569
        
                   ? readFile("$link/nixos-version")

     

       568
       570
        
                   : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]);

     

       569
       569
       -
               addEntry("NixOS - Configuration " . nrFromGen($link) . " ($date - $version)", $link);

     

       571
       571
       +
               addEntry("NixOS - Configuration " . nrFromGen($link) . " ($date - $version)", $link, $subEntryOptions);

     

       570
       572
        
           }

     

       571
       573
        
       

     

       572
       574
        
           $conf .= "}\n" if $grubVersion == 2;