commit fa09e0a3c7cc91b766b0bd34fcfe51b69bd8cca6 · pyrox.dev/nixpkgs

nixos/modules/module-list.nix

···

       1370
       1370
        
         ./tasks/filesystems/cifs.nix

     

       1371
       1371
        
         ./tasks/filesystems/ecryptfs.nix

     

       1372
       1372
        
         ./tasks/filesystems/envfs.nix

     

       1373
       1373
       +
         ./tasks/filesystems/erofs.nix

     

       1373
       1374
        
         ./tasks/filesystems/exfat.nix

     

       1374
       1375
        
         ./tasks/filesystems/ext.nix

     

       1375
       1376
        
         ./tasks/filesystems/f2fs.nix

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

···

       293
       293
        
           # Skip fsck for inherently readonly filesystems.

     

       294
       294
        
           if [ "$fsType" = squashfs ]; then return 0; fi

     

       295
       295
        
       

     

       296
       296
       +
           # Skip fsck.erofs because it is still experimental.

     

       297
       297
       +
           if [ "$fsType" = erofs ]; then return 0; fi

     

       298
       298
       +
       

     

       296
       299
        
           # If we couldn't figure out the FS type, then skip fsck.

     

       297
       300
        
           if [ "$fsType" = auto ]; then

     

       298
       301
        
               echo 'cannot check filesystem with type "auto"!'

+21

nixos/modules/tasks/filesystems/erofs.nix

···

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
       

     

       5
       5
       +
         inInitrd = lib.any (fs: fs == "erofs") config.boot.initrd.supportedFilesystems;

     

       6
       6
       +
         inSystem = lib.any (fs: fs == "erofs") config.boot.supportedFilesystems;

     

       7
       7
       +
       

     

       8
       8
       +
       in

     

       9
       9
       +
       

     

       10
       10
       +
       {

     

       11
       11
       +
         config = lib.mkIf (inInitrd || inSystem) {

     

       12
       12
       +
       

     

       13
       13
       +
           system.fsPackages = [ pkgs.erofs-utils ];

     

       14
       14
       +
       

     

       15
       15
       +
           boot.initrd.availableKernelModules = lib.mkIf inInitrd [ "erofs" ];

     

       16
       16
       +
       

     

       17
       17
       +
           # fsck.erofs is currently experimental and should not be run as a

     

       18
       18
       +
           # privileged user. Thus, it is not included in the initrd.

     

       19
       19
       +
       

     

       20
       20
       +
         };

     

       21
       21
       +
       }

+92 -41

nixos/tests/non-default-filesystems.nix

···

       1
       1
       -
       import ./make-test-python.nix ({ lib, pkgs, ... }:

     

       1
       1
       +
       { system ? builtins.currentSystem

     

       2
       2
       +
       , config ? { }

     

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

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

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

     

       7
       7
       +
       with pkgs.lib;

     

       2
       8
        
       {

     

       3
       3
       -
         name = "non-default-filesystems";

     

       9
       9
       +
         btrfs = makeTest

     

       10
       10
       +
           {

     

       11
       11
       +
             name = "non-default-filesystems-btrfs";

     

       4
       12
        
       

     

       5
       5
       -
         nodes.machine =

     

       6
       6
       -
           { config, pkgs, lib, ... }:

     

       7
       7
       -
           let

     

       8
       8
       -
             disk = config.virtualisation.rootDevice;

     

       9
       9
       -
           in

     

       10
       10
       -
           {

     

       11
       11
       -
             virtualisation.rootDevice = "/dev/vda";

     

       12
       12
       -
             virtualisation.useDefaultFilesystems = false;

     

       13
       13
       +
             nodes.machine =

     

       14
       14
       +
               { config, pkgs, lib, ... }:

     

       15
       15
       +
               let

     

       16
       16
       +
                 disk = config.virtualisation.rootDevice;

     

       17
       17
       +
               in

     

       18
       18
       +
               {

     

       19
       19
       +
                 virtualisation.rootDevice = "/dev/vda";

     

       20
       20
       +
                 virtualisation.useDefaultFilesystems = false;

     

       21
       21
       +
       

     

       22
       22
       +
                 boot.initrd.availableKernelModules = [ "btrfs" ];

     

       23
       23
       +
                 boot.supportedFilesystems = [ "btrfs" ];

     

       24
       24
       +
       

     

       25
       25
       +
                 boot.initrd.postDeviceCommands = ''

     

       26
       26
       +
                   FSTYPE=$(blkid -o value -s TYPE ${disk} || true)

     

       27
       27
       +
                   if test -z "$FSTYPE"; then

     

       28
       28
       +
                     modprobe btrfs

     

       29
       29
       +
                     ${pkgs.btrfs-progs}/bin/mkfs.btrfs ${disk}

     

       30
       30
       +
       

     

       31
       31
       +
                     mkdir /nixos

     

       32
       32
       +
                     mount -t btrfs ${disk} /nixos

     

       33
       33
       +
       

     

       34
       34
       +
                     ${pkgs.btrfs-progs}/bin/btrfs subvolume create /nixos/root

     

       35
       35
       +
                     ${pkgs.btrfs-progs}/bin/btrfs subvolume create /nixos/home

     

       13
       36
        
       

     

       14
       14
       -
             boot.initrd.availableKernelModules = [ "btrfs" ];

     

       15
       15
       -
             boot.supportedFilesystems = [ "btrfs" ];

     

       37
       37
       +
                     umount /nixos

     

       38
       38
       +
                   fi

     

       39
       39
       +
                 '';

     

       16
       40
        
       

     

       17
       17
       -
             boot.initrd.postDeviceCommands = ''

     

       18
       18
       -
               FSTYPE=$(blkid -o value -s TYPE ${disk} || true)

     

       19
       19
       -
               if test -z "$FSTYPE"; then

     

       20
       20
       -
                 modprobe btrfs

     

       21
       21
       -
                 ${pkgs.btrfs-progs}/bin/mkfs.btrfs ${disk}

     

       41
       41
       +
                 virtualisation.fileSystems = {

     

       42
       42
       +
                   "/" = {

     

       43
       43
       +
                     device = disk;

     

       44
       44
       +
                     fsType = "btrfs";

     

       45
       45
       +
                     options = [ "subvol=/root" ];

     

       46
       46
       +
                   };

     

       22
       47
        
       

     

       23
       23
       -
                 mkdir /nixos

     

       24
       24
       -
                 mount -t btrfs ${disk} /nixos

     

       48
       48
       +
                   "/home" = {

     

       49
       49
       +
                     device = disk;

     

       50
       50
       +
                     fsType = "btrfs";

     

       51
       51
       +
                     options = [ "subvol=/home" ];

     

       52
       52
       +
                   };

     

       53
       53
       +
                 };

     

       54
       54
       +
               };

     

       25
       55
        
       

     

       26
       26
       -
                 ${pkgs.btrfs-progs}/bin/btrfs subvolume create /nixos/root

     

       27
       27
       -
                 ${pkgs.btrfs-progs}/bin/btrfs subvolume create /nixos/home

     

       56
       56
       +
             testScript = ''

     

       57
       57
       +
               machine.wait_for_unit("multi-user.target")

     

       28
       58
        
       

     

       29
       29
       -
                 umount /nixos

     

       30
       30
       -
               fi

     

       59
       59
       +
               with subtest("BTRFS filesystems are mounted correctly"):

     

       60
       60
       +
                 machine.succeed("grep -E '/dev/vda / btrfs rw,relatime,space_cache=v2,subvolid=[0-9]+,subvol=/root 0 0' /proc/mounts")

     

       61
       61
       +
                 machine.succeed("grep -E '/dev/vda /home btrfs rw,relatime,space_cache=v2,subvolid=[0-9]+,subvol=/home 0 0' /proc/mounts")

     

       31
       62
        
             '';

     

       63
       63
       +
           };

     

       32
       64
        
       

     

       33
       33
       -
             virtualisation.fileSystems = {

     

       34
       34
       -
               "/" = {

     

       35
       35
       -
                 device = disk;

     

       36
       36
       -
                 fsType = "btrfs";

     

       37
       37
       -
                 options = [ "subvol=/root" ];

     

       38
       38
       -
               };

     

       65
       65
       +
         erofs =

     

       66
       66
       +
           let

     

       67
       67
       +
             fsImage = "/tmp/non-default-filesystem.img";

     

       68
       68
       +
           in

     

       69
       69
       +
           makeTest {

     

       70
       70
       +
             name = "non-default-filesystems-erofs";

     

       39
       71
        
       

     

       40
       40
       -
               "/home" = {

     

       41
       41
       -
                 device = disk;

     

       42
       42
       -
                 fsType = "btrfs";

     

       43
       43
       -
                 options = [ "subvol=/home" ];

     

       72
       72
       +
             nodes.machine = _: {

     

       73
       73
       +
               virtualisation.qemu.drives = [{

     

       74
       74
       +
                 name = "non-default-filesystem";

     

       75
       75
       +
                 file = fsImage;

     

       76
       76
       +
               }];

     

       77
       77
       +
       

     

       78
       78
       +
               virtualisation.fileSystems."/non-default" = {

     

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

     

       80
       80
       +
                 fsType = "erofs";

     

       81
       81
       +
                 neededForBoot = true;

     

       44
       82
        
               };

     

       45
       83
        
             };

     

       46
       46
       -
           };

     

       84
       84
       +
       

     

       85
       85
       +
             testScript = ''

     

       86
       86
       +
               import subprocess

     

       87
       87
       +
               import tempfile

     

       88
       88
       +
       

     

       89
       89
       +
               with tempfile.TemporaryDirectory() as tmp_dir:

     

       90
       90
       +
                 with open(f"{tmp_dir}/filesystem", "w") as f:

     

       91
       91
       +
                     f.write("erofs")

     

       92
       92
       +
       

     

       93
       93
       +
                 subprocess.run([

     

       94
       94
       +
                   "${pkgs.erofs-utils}/bin/mkfs.erofs",

     

       95
       95
       +
                   "${fsImage}",

     

       96
       96
       +
                   tmp_dir,

     

       97
       97
       +
                 ])

     

       47
       98
        
       

     

       48
       48
       -
         testScript = ''

     

       49
       49
       -
           machine.wait_for_unit("multi-user.target")

     

       99
       99
       +
               machine.start()

     

       100
       100
       +
               machine.wait_for_unit("default.target")

     

       50
       101
        
       

     

       51
       51
       -
           with subtest("BTRFS filesystems are mounted correctly"):

     

       52
       52
       -
             machine.succeed("grep -E '/dev/vda / btrfs rw,relatime,space_cache=v2,subvolid=[0-9]+,subvol=/root 0 0' /proc/mounts")

     

       53
       53
       -
             machine.succeed("grep -E '/dev/vda /home btrfs rw,relatime,space_cache=v2,subvolid=[0-9]+,subvol=/home 0 0' /proc/mounts")

     

       54
       54
       -
         '';

     

       55
       55
       -
       })

     

       102
       102
       +
               file_contents = machine.succeed("cat /non-default/filesystem")

     

       103
       103
       +
               assert "erofs" in file_contents

     

       104
       104
       +
             '';

     

       105
       105
       +
           };

     

       106
       106
       +
       }