commit 603320b64f27d8ebd629639f85cec642e051bbd0 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/installer/tools/nixos-generate-config.pl

···

       473
       473
        
           }

     

       474
       474
        
       

     

       475
       475
        
           # Don't emit tmpfs entry for /tmp, because it most likely comes from the

     

       476
       476
       -
           # boot.tmpOnTmpfs option in configuration.nix (managed declaratively).

     

       476
       476
       +
           # boot.tmp.useTmpfs option in configuration.nix (managed declaratively).

     

       477
       477
        
           next if ($mountPoint eq "/tmp" && $fsType eq "tmpfs");

     

       478
       478
        
       

     

       479
       479
        
           # Emit the filesystem.

+43 -38

nixos/modules/system/boot/tmp.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
         cfg = config.boot;

     

       6
       6
       +
         cfg = config.boot.tmp;

     

       7
       7
        
       in

     

       8
       8
        
       {

     

       9
       9
       -
       

     

       10
       10
       -
         ###### interface

     

       9
       9
       +
         imports = [

     

       10
       10
       +
           (mkRenamedOptionModule [ "boot" "cleanTmpDir" ] [ "boot" "tmp" "cleanOnBoot" ])

     

       11
       11
       +
           (mkRenamedOptionModule [ "boot" "tmpOnTmpfs" ] [ "boot" "tmp" "useTmpfs" ])

     

       12
       12
       +
           (mkRenamedOptionModule [ "boot" "tmpOnTmpfsSize" ] [ "boot" "tmp" "tmpfsSize" ])

     

       13
       13
       +
         ];

     

       11
       14
        
       

     

       12
       15
        
         options = {

     

       16
       16
       +
           boot.tmp = {

     

       17
       17
       +
             cleanOnBoot = mkOption {

     

       18
       18
       +
               type = types.bool;

     

       19
       19
       +
               default = false;

     

       20
       20
       +
               description = lib.mdDoc ''

     

       21
       21
       +
                 Whether to delete all files in {file}`/tmp` during boot.

     

       22
       22
       +
               '';

     

       23
       23
       +
             };

     

       13
       24
        
       

     

       14
       14
       -
           boot.cleanTmpDir = mkOption {

     

       15
       15
       -
             type = types.bool;

     

       16
       16
       -
             default = false;

     

       17
       17
       -
             description = lib.mdDoc ''

     

       18
       18
       -
               Whether to delete all files in {file}`/tmp` during boot.

     

       19
       19
       -
             '';

     

       20
       20
       -
           };

     

       25
       25
       +
             tmpfsSize = mkOption {

     

       26
       26
       +
               type = types.oneOf [ types.str types.types.ints.positive ];

     

       27
       27
       +
               default = "50%";

     

       28
       28
       +
               description = lib.mdDoc ''

     

       29
       29
       +
                 Size of tmpfs in percentage.

     

       30
       30
       +
                 Percentage is defined by systemd.

     

       31
       31
       +
               '';

     

       32
       32
       +
             };

     

       21
       33
        
       

     

       22
       22
       -
           boot.tmpOnTmpfs = mkOption {

     

       23
       23
       -
             type = types.bool;

     

       24
       24
       -
             default = false;

     

       25
       25
       -
             description = lib.mdDoc ''

     

       26
       26
       -
                Whether to mount a tmpfs on {file}`/tmp` during boot.

     

       27
       27
       -
             '';

     

       28
       28
       -
           };

     

       34
       34
       +
             useTmpfs = mkOption {

     

       35
       35
       +
               type = types.bool;

     

       36
       36
       +
               default = false;

     

       37
       37
       +
               description = lib.mdDoc ''

     

       38
       38
       +
                  Whether to mount a tmpfs on {file}`/tmp` during boot.

     

       29
       39
        
       

     

       30
       30
       -
           boot.tmpOnTmpfsSize = mkOption {

     

       31
       31
       -
             type = types.oneOf [ types.str types.types.ints.positive ];

     

       32
       32
       -
             default = "50%";

     

       33
       33
       -
             description = lib.mdDoc ''

     

       34
       34
       -
               Size of tmpfs in percentage.

     

       35
       35
       -
               Percentage is defined by systemd.

     

       36
       36
       -
             '';

     

       40
       40
       +
                  ::: {.note}

     

       41
       41
       +
                  Large Nix builds can fail if the mounted tmpfs is not large enough.

     

       42
       42
       +
                  In such a case either increase the tmpfsSize or disable this option.

     

       43
       43
       +
                  :::

     

       44
       44
       +
               '';

     

       45
       45
       +
             };

     

       37
       46
        
           };

     

       38
       38
       -
       

     

       39
       47
        
         };

     

       40
       48
        
       

     

       41
       41
       -
         ###### implementation

     

       42
       42
       -
       

     

       43
       49
        
         config = {

     

       44
       44
       -
       

     

       45
       50
        
           # When changing remember to update /tmp mount in virtualisation/qemu-vm.nix

     

       46
       46
       -
           systemd.mounts = mkIf cfg.tmpOnTmpfs [

     

       51
       51
       +
           systemd.mounts = mkIf cfg.useTmpfs [

     

       47
       52
        
             {

     

       48
       53
        
               what = "tmpfs";

     

       49
       54
        
               where = "/tmp";

     

       50
       55
        
               type = "tmpfs";

     

       51
       51
       -
               mountConfig.Options = concatStringsSep "," [ "mode=1777"

     

       52
       52
       -
                                                            "strictatime"

     

       53
       53
       -
                                                            "rw"

     

       54
       54
       -
                                                            "nosuid"

     

       55
       55
       -
                                                            "nodev"

     

       56
       56
       -
                                                            "size=${toString cfg.tmpOnTmpfsSize}" ];

     

       56
       56
       +
               mountConfig.Options = concatStringsSep "," [

     

       57
       57
       +
                 "mode=1777"

     

       58
       58
       +
                 "strictatime"

     

       59
       59
       +
                 "rw"

     

       60
       60
       +
                 "nosuid"

     

       61
       61
       +
                 "nodev"

     

       62
       62
       +
                 "size=${toString cfg.tmpfsSize}"

     

       63
       63
       +
               ];

     

       57
       64
        
             }

     

       58
       65
        
           ];

     

       59
       66
        
       

     

       60
       60
       -
           systemd.tmpfiles.rules = optional config.boot.cleanTmpDir "D! /tmp 1777 root root";

     

       61
       61
       -
       

     

       67
       67
       +
           systemd.tmpfiles.rules = optional cfg.cleanOnBoot "D! /tmp 1777 root root";

     

       62
       68
        
         };

     

       63
       63
       -
       

     

       64
       69
        
       }

+2 -2

nixos/modules/virtualisation/qemu-vm.nix

···

       1069
       1069
        
                 fsType = "ext4";

     

       1070
       1070
        
                 autoFormat = true;

     

       1071
       1071
        
               });

     

       1072
       1072
       -
               "/tmp" = lib.mkIf config.boot.tmpOnTmpfs {

     

       1072
       1072
       +
               "/tmp" = lib.mkIf config.boot.tmp.useTmpfs {

     

       1073
       1073
        
                 device = "tmpfs";

     

       1074
       1074
        
                 fsType = "tmpfs";

     

       1075
       1075
        
                 neededForBoot = true;

     

       1076
       1076
        
                 # Sync with systemd's tmp.mount;

     

       1077
       1077
       -
                 options = [ "mode=1777" "strictatime" "nosuid" "nodev" "size=${toString config.boot.tmpOnTmpfsSize}" ];

     

       1077
       1077
       +
                 options = [ "mode=1777" "strictatime" "nosuid" "nodev" "size=${toString config.boot.tmp.tmpfsSize}" ];

     

       1078
       1078
        
               };

     

       1079
       1079
        
               "/nix/${if cfg.writableStore then ".ro-store" else "store"}" = lib.mkIf cfg.useNixStoreImage {

     

       1080
       1080
        
                 device = "${lookupDriveDeviceName "nix-store" cfg.qemu.drives}";

+1 -1

nixos/tests/ihatemoney/default.nix

···

       17
       17
        
                 http = ":8000";

     

       18
       18
        
               };

     

       19
       19
        
             };

     

       20
       20
       -
             boot.cleanTmpDir = true;

     

       20
       20
       +
             boot.tmp.cleanOnBoot = true;

     

       21
       21
        
             # for exchange rates

     

       22
       22
        
             security.pki.certificateFiles = [ ./server.crt ];

     

       23
       23
        
             networking.extraHosts = "127.0.0.1 api.exchangerate.host";