commit bc32ab809c27f95b05b240c94e1eb303d2325df8 · pyrox.dev/nixpkgs

+8 -2

nixos/tests/all-tests.nix

···

       557
       557
        
         froide-govplan = runTest ./web-apps/froide-govplan.nix;

     

       558
       558
        
         frp = runTest ./frp.nix;

     

       559
       559
        
         frr = runTest ./frr.nix;

     

       560
       560
       -
         fsck = handleTest ./fsck.nix { };

     

       561
       561
       -
         fsck-systemd-stage-1 = handleTest ./fsck.nix { systemdStage1 = true; };

     

       560
       560
       +
         fsck = runTest {

     

       561
       561
       +
           imports = [ ./fsck.nix ];

     

       562
       562
       +
           _module.args.systemdStage1 = false;

     

       563
       563
       +
         };

     

       564
       564
       +
         fsck-systemd-stage-1 = runTest {

     

       565
       565
       +
           imports = [ ./fsck.nix ];

     

       566
       566
       +
           _module.args.systemdStage1 = true;

     

       567
       567
       +
         };

     

       562
       568
        
         ft2-clone = runTest ./ft2-clone.nix;

     

       563
       569
        
         legit = runTest ./legit.nix;

     

       564
       570
        
         mimir = runTest ./mimir.nix;

+12 -19

nixos/tests/fsck.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         system ? builtins.currentSystem,

     

       3
       3
       -
         config ? { },

     

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

     

       5
       5
       -
         systemdStage1 ? false,

     

       6
       6
       -
       }:

     

       1
       1
       +
       { systemdStage1, ... }:

     

       7
       2
        
       

     

       8
       8
       -
       import ./make-test-python.nix {

     

       3
       3
       +
       {

     

       9
       4
        
         name = "fsck";

     

       10
       5
        
       

     

       11
       11
       -
         nodes.machine =

     

       12
       12
       -
           { lib, ... }:

     

       13
       13
       -
           {

     

       14
       14
       -
             virtualisation.emptyDiskImages = [ 1 ];

     

       6
       6
       +
         nodes.machine = {

     

       7
       7
       +
           virtualisation.emptyDiskImages = [ 1 ];

     

       15
       8
        
       

     

       16
       16
       -
             virtualisation.fileSystems = {

     

       17
       17
       -
               "/mnt" = {

     

       18
       18
       -
                 device = "/dev/vdb";

     

       19
       19
       -
                 fsType = "ext4";

     

       20
       20
       -
                 autoFormat = true;

     

       21
       21
       -
               };

     

       9
       9
       +
           virtualisation.fileSystems = {

     

       10
       10
       +
             "/mnt" = {

     

       11
       11
       +
               device = "/dev/vdb";

     

       12
       12
       +
               fsType = "ext4";

     

       13
       13
       +
               autoFormat = true;

     

       22
       14
        
             };

     

       15
       15
       +
           };

     

       23
       16
        
       

     

       24
       24
       -
             boot.initrd.systemd.enable = systemdStage1;

     

       25
       25
       -
           };

     

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

     

       18
       18
       +
         };

     

       26
       19
        
       

     

       27
       20
        
         testScript =

     

       28
       21
        
           { nodes, ... }: