commit 78f6f779627c89823d8402aac658418ef188be1c · pyrox.dev/nixpkgs

+2 -1

nixos/modules/installer/cd-dvd/channel.nix

···

       39
       39
        
               echo "unpacking the NixOS/Nixpkgs sources..."

     

       40
       40
        
               mkdir -p /nix/var/nix/profiles/per-user/root

     

       41
       41
        
               ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels \

     

       42
       42
       -
                 -i ${channelSources} --quiet --option build-use-substitutes false

     

       42
       42
       +
                 -i ${channelSources} --quiet --option build-use-substitutes false \

     

       43
       43
       +
                 ${optionalString config.boot.initrd.systemd.enable "--option sandbox false"} # There's an issue with pivot_root

     

       43
       44
        
               mkdir -m 0700 -p /root/.nix-defexpr

     

       44
       45
        
               ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels

     

       45
       46
        
               mkdir -m 0755 -p /var/lib/nixos

+4

nixos/modules/profiles/installation-device.nix

···

       99
       99
        
               stdenvNoCC # for runCommand

     

       100
       100
        
               busybox

     

       101
       101
        
               jq # for closureInfo

     

       102
       102
       +
               # For boot.initrd.systemd

     

       103
       103
       +
               makeInitrdNGTool

     

       104
       104
       +
               systemdStage1

     

       105
       105
       +
               systemdStage1Network

     

       102
       106
        
             ];

     

       103
       107
        
       

     

       104
       108
        
           # Show all debug messages from the kernel but don't log refused packets

+15

nixos/modules/system/boot/systemd/initrd.nix

···

       479
       479
        
                 ''systemctl --no-block switch-root /sysroot "''${NEW_INIT}"''

     

       480
       480
        
               ];

     

       481
       481
        
             };

     

       482
       482
       +
       

     

       483
       483
       +
             services.panic-on-fail = {

     

       484
       484
       +
               wantedBy = ["emergency.target"];

     

       485
       485
       +
               unitConfig = {

     

       486
       486
       +
                 DefaultDependencies = false;

     

       487
       487
       +
                 ConditionKernelCommandLine = [

     

       488
       488
       +
                   "|boot.panic_on_fail"

     

       489
       489
       +
                   "|stage1panic"

     

       490
       490
       +
                 ];

     

       491
       491
       +
               };

     

       492
       492
       +
               script = ''

     

       493
       493
       +
                 echo c > /proc/sysrq-trigger

     

       494
       494
       +
               '';

     

       495
       495
       +
               serviceConfig.Type = "oneshot";

     

       496
       496
       +
             };

     

       482
       497
        
           };

     

       483
       498
        
       

     

       484
       499
        
           boot.kernelParams = lib.mkIf (config.boot.resumeDevice != "") [ "resume=${config.boot.resumeDevice}" ];

+1

nixos/tests/all-tests.nix

···

       235
       235
        
         input-remapper = handleTest ./input-remapper.nix {};

     

       236
       236
        
         inspircd = handleTest ./inspircd.nix {};

     

       237
       237
        
         installer = handleTest ./installer.nix {};

     

       238
       238
       +
         installer-systemd-stage-1 = handleTest ./installer-systemd-stage-1.nix {};

     

       238
       239
        
         invoiceplane = handleTest ./invoiceplane.nix {};

     

       239
       240
        
         iodine = handleTest ./iodine.nix {};

     

       240
       241
        
         ipfs = handleTest ./ipfs.nix {};

+33

nixos/tests/installer-systemd-stage-1.nix

···

       1
       1
       +
       { system ? builtins.currentSystem

     

       2
       2
       +
       , config ? {}

     

       3
       3
       +
       , pkgs ? import ../.. { inherit system config; }

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       {

     

       7
       7
       +
         # Some of these tests don't work with systemd stage 1 yet. Uncomment

     

       8
       8
       +
         # them when fixed.

     

       9
       9
       +
         inherit (import ./installer.nix { inherit system config pkgs; systemdStage1 = true; })

     

       10
       10
       +
           # bcache

     

       11
       11
       +
           # btrfsSimple

     

       12
       12
       +
           # btrfsSubvolDefault

     

       13
       13
       +
           # btrfsSubvols

     

       14
       14
       +
           # encryptedFSWithKeyfile

     

       15
       15
       +
           # grub1

     

       16
       16
       +
           # luksroot

     

       17
       17
       +
           # luksroot-format1

     

       18
       18
       +
           # luksroot-format2

     

       19
       19
       +
           # lvm

     

       20
       20
       +
           separateBoot

     

       21
       21
       +
           separateBootFat

     

       22
       22
       +
           simple

     

       23
       23
       +
           simpleLabels

     

       24
       24
       +
           simpleProvided

     

       25
       25
       +
           simpleSpecialised

     

       26
       26
       +
           simpleUefiGrub

     

       27
       27
       +
           simpleUefiGrubSpecialisation

     

       28
       28
       +
           simpleUefiSystemdBoot

     

       29
       29
       +
           # swraid

     

       30
       30
       +
           # zfsroot

     

       31
       31
       +
           ;

     

       32
       32
       +
       

     

       33
       33
       +
       }

+6 -1

nixos/tests/installer.nix

···

       1
       1
        
       { system ? builtins.currentSystem,

     

       2
       2
        
         config ? {},

     

       3
       3
       -
         pkgs ? import ../.. { inherit system config; }

     

       3
       3
       +
         pkgs ? import ../.. { inherit system config; },

     

       4
       4
       +
         systemdStage1 ? false

     

       4
       5
        
       }:

     

       5
       6
        
       

     

       6
       7
        
       with import ../lib/testing-python.nix { inherit system pkgs; };

     
···

       22
       23
        
       

     

       23
       24
        
               # To ensure that we can rebuild the grub configuration on the nixos-rebuild

     

       24
       25
        
               system.extraDependencies = with pkgs; [ stdenvNoCC ];

     

       26
       26
       +
       

     

       27
       27
       +
               ${optionalString systemdStage1 "boot.initrd.systemd.enable = true;"}

     

       25
       28
        
       

     

       26
       29
        
               ${optionalString (bootLoader == "grub") ''

     

       27
       30
        
                 boot.loader.grub.version = ${toString grubVersion};

     
···

       289
       292
        
                 virtualisation.diskSize = 8 * 1024;

     

       290
       293
        
                 virtualisation.cores = 8;

     

       291
       294
        
                 virtualisation.memorySize = 1536;

     

       295
       295
       +
       

     

       296
       296
       +
                 boot.initrd.systemd.enable = systemdStage1;

     

       292
       297
        
       

     

       293
       298
        
                 # Use a small /dev/vdb as the root disk for the

     

       294
       299
        
                 # installer. This ensures the target disk (/dev/vda) is