public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #131876 from NixOS/backport-131760-to-release-21.05 

[Backport release-21.05] nixos/installer: force root fs type
This commit is contained in:
Robert Hensing 2021-08-01 23:06:37 +02:00 committed by GitHub
parent 16bf3980bf f6754032ee
commit 3ed3b163aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/installer/cd-dvd/iso-image.nix
View File

@ -644,7 +644,11 @@ in
]; ];
fileSystems."/" = 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" ]; options = [ "mode=0755" ];
}; };

6
nixos/modules/installer/netboot/netboot.nix
View File

@ -30,7 +30,11 @@ with lib;
else [ pkgs.grub2 pkgs.syslinux ]); else [ pkgs.grub2 pkgs.syslinux ]);
fileSystems."/" = 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" ]; options = [ "mode=0755" ];
}; };