diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-29 00:01:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-29 00:01:33 +0000 |
| commit | 4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc (patch) | |
| tree | 009d65e0b0351612af7de7970317a9890fdc1657 /nixos/modules/installer/netboot | |
| parent | 6fcda9f1ec27db14412a2103281b4b14f806066a (diff) | |
| parent | db809100db91e97c118a70c3879307afdbf1dbb7 (diff) | |
| download | nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.gz nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.bz2 nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.lz nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.xz nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.zst nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/installer/netboot')
| -rw-r--r-- | nixos/modules/installer/netboot/netboot.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index 238ab6d0617..f7543fdf4a2 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -30,7 +30,11 @@ with lib; else [ pkgs.grub2 pkgs.syslinux ]); fileSystems."/" = - { fsType = "tmpfs"; + # This module is often over-layed onto an existing host config + # that defines `/`. We use mkOverride 60 to override standard + # values, but at the same time leave room for mkForce values + # targeted at the image build. + { fsType = mkOverride 60 "tmpfs"; options = [ "mode=0755" ]; }; |