commit 94a906b59a7c73f6a0b6ef120f89ee0f927f0dc9 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/system/boot/stage-2-init.sh

···

       159
       159
        
       

     

       160
       160
        
       # Start systemd.

     

       161
       161
        
       echo "starting systemd..."

     

       162
       162
       -
       PATH=/run/current-system/systemd/lib/systemd \

     

       162
       162
       +
       PATH=/run/current-system/systemd/lib/systemd:@fsPackagesPath@ \

     

       163
       163
        
           LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive \

     

       164
       164
        
           exec systemd

+1

nixos/modules/system/boot/stage-2.nix

···

       17
       17
        
             pkgs.utillinux

     

       18
       18
        
             pkgs.openresolv

     

       19
       19
        
           ];

     

       20
       20
       +
           fsPackagesPath = lib.makeBinPath config.system.fsPackages;

     

       20
       21
        
           postBootCommands = pkgs.writeText "local-cmds"

     

       21
       22
        
             ''

     

       22
       23
        
               ${config.boot.postBootCommands}

+1

nixos/release.nix

···

       291
       291
        
         tests.firefox = callTest tests/firefox.nix {};

     

       292
       292
        
         tests.flatpak = callTest tests/flatpak.nix {};

     

       293
       293
        
         tests.firewall = callTest tests/firewall.nix {};

     

       294
       294
       +
         tests.fsck = callTest tests/fsck.nix {};

     

       294
       295
        
         tests.fwupd = callTest tests/fwupd.nix {};

     

       295
       296
        
         tests.gdk-pixbuf = callTest tests/gdk-pixbuf.nix {};

     

       296
       297
        
         #tests.gitlab = callTest tests/gitlab.nix {};

+29

nixos/tests/fsck.nix

···

       1
       1
       +
       import ./make-test.nix {

     

       2
       2
       +
         name = "fsck";

     

       3
       3
       +
       

     

       4
       4
       +
         machine = { lib, ... }: {

     

       5
       5
       +
           virtualisation.emptyDiskImages = [ 1 ];

     

       6
       6
       +
       

     

       7
       7
       +
           fileSystems = lib.mkVMOverride {

     

       8
       8
       +
             "/mnt" = {

     

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

     

       10
       10
       +
               fsType = "ext4";

     

       11
       11
       +
               autoFormat = true;

     

       12
       12
       +
             };

     

       13
       13
       +
           };

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         testScript = ''

     

       17
       17
       +
           $machine->waitForUnit('default.target');

     

       18
       18
       +
       

     

       19
       19
       +
           subtest "root fs is fsckd", sub {

     

       20
       20
       +
             $machine->succeed('journalctl -b | grep "fsck.ext4.*/dev/vda"');

     

       21
       21
       +
           };

     

       22
       22
       +
       

     

       23
       23
       +
           subtest "mnt fs is fsckd", sub {

     

       24
       24
       +
             $machine->succeed('journalctl -b | grep "fsck.*/dev/vdb.*clean"');

     

       25
       25
       +
             $machine->succeed('grep "Requires=systemd-fsck@dev-vdb.service" /run/systemd/generator/mnt.mount');

     

       26
       26
       +
             $machine->succeed('grep "After=systemd-fsck@dev-vdb.service" /run/systemd/generator/mnt.mount');

     

       27
       27
       +
           };

     

       28
       28
       +
         '';

     

       29
       29
       +
       }