commit fbebce610fb44b1de7c3abbed814ada4ba374426 · pyrox.dev/nixpkgs

+1 -31

nixos/modules/system/activation/top-level.nix

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         systemBuilder =

     

       7
       7
       -
           let

     

       8
       8
       -
             kernelPath = "${config.boot.kernelPackages.kernel}/" +

     

       9
       9
       -
               "${config.system.boot.loader.kernelFile}";

     

       10
       10
       -
             initrdPath = "${config.system.build.initialRamdisk}/" +

     

       11
       11
       -
               "${config.system.boot.loader.initrdFile}";

     

       12
       12
       -
           in ''

     

       7
       7
       +
           ''

     

       13
       8
        
             mkdir $out

     

       14
       14
       -
       

     

       15
       15
       -
             # Containers don't have their own kernel or initrd.  They boot

     

       16
       16
       -
             # directly into stage 2.

     

       17
       17
       -
             ${optionalString config.boot.kernel.enable ''

     

       18
       18
       -
               if [ ! -f ${kernelPath} ]; then

     

       19
       19
       -
                 echo "The bootloader cannot find the proper kernel image."

     

       20
       20
       -
                 echo "(Expecting ${kernelPath})"

     

       21
       21
       -
                 false

     

       22
       22
       -
               fi

     

       23
       23
       -
       

     

       24
       24
       -
               ln -s ${kernelPath} $out/kernel

     

       25
       25
       -
               ln -s ${config.system.modulesTree} $out/kernel-modules

     

       26
       26
       -
               ${optionalString (config.hardware.deviceTree.package != null) ''

     

       27
       27
       -
                 ln -s ${config.hardware.deviceTree.package} $out/dtbs

     

       28
       28
       -
               ''}

     

       29
       29
       -
       

     

       30
       30
       -
               echo -n "$kernelParams" > $out/kernel-params

     

       31
       31
       -
       

     

       32
       32
       -
               ln -s ${initrdPath} $out/initrd

     

       33
       33
       -
       

     

       34
       34
       -
               ln -s ${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets $out

     

       35
       35
       -
       

     

       36
       36
       -
               ln -s ${config.hardware.firmware}/lib/firmware $out/firmware

     

       37
       37
       -
             ''}

     

       38
       9
        
       

     

       39
       10
        
             ${if config.boot.initrd.systemd.enable then ''

     

       40
       11
        
               cp ${config.system.build.bootStage2} $out/prepare-root

     
···

       83
       54
        
       

     

       84
       55
        
           systemd = config.systemd.package;

     

       85
       56
        
       

     

       86
       86
       -
           kernelParams = config.boot.kernelParams;

     

       87
       57
        
           nixosLabel = config.system.nixos.label;

     

       88
       58
        
       

     

       89
       59
        
           inherit (config.system) extraDependencies;

+32

nixos/modules/system/boot/kernel.nix

···

       309
       309
        
       

     

       310
       310
        
               system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;

     

       311
       311
        
       

     

       312
       312
       +
               # Not required for, e.g., containers as they don't have their own kernel or initrd.

     

       313
       313
       +
               # They boot directly into stage 2.

     

       314
       314
       +
               system.systemBuilderArgs.kernelParams = config.boot.kernelParams;

     

       315
       315
       +
               system.systemBuilderCommands =

     

       316
       316
       +
                 let

     

       317
       317
       +
                   kernelPath = "${config.boot.kernelPackages.kernel}/" +

     

       318
       318
       +
                     "${config.system.boot.loader.kernelFile}";

     

       319
       319
       +
                   initrdPath = "${config.system.build.initialRamdisk}/" +

     

       320
       320
       +
                     "${config.system.boot.loader.initrdFile}";

     

       321
       321
       +
                 in

     

       322
       322
       +
                 ''

     

       323
       323
       +
                   if [ ! -f ${kernelPath} ]; then

     

       324
       324
       +
                     echo "The bootloader cannot find the proper kernel image."

     

       325
       325
       +
                     echo "(Expecting ${kernelPath})"

     

       326
       326
       +
                     false

     

       327
       327
       +
                   fi

     

       328
       328
       +
       

     

       329
       329
       +
                   ln -s ${kernelPath} $out/kernel

     

       330
       330
       +
                   ln -s ${config.system.modulesTree} $out/kernel-modules

     

       331
       331
       +
                   ${optionalString (config.hardware.deviceTree.package != null) ''

     

       332
       332
       +
                     ln -s ${config.hardware.deviceTree.package} $out/dtbs

     

       333
       333
       +
                   ''}

     

       334
       334
       +
       

     

       335
       335
       +
                   echo -n "$kernelParams" > $out/kernel-params

     

       336
       336
       +
       

     

       337
       337
       +
                   ln -s ${initrdPath} $out/initrd

     

       338
       338
       +
       

     

       339
       339
       +
                   ln -s ${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets $out

     

       340
       340
       +
       

     

       341
       341
       +
                   ln -s ${config.hardware.firmware}/lib/firmware $out/firmware

     

       342
       342
       +
                 '';

     

       343
       343
       +
       

     

       312
       344
        
               # Implement consoleLogLevel both in early boot and using sysctl

     

       313
       345
        
               # (so you don't need to reboot to have changes take effect).

     

       314
       346
        
               boot.kernelParams =