diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2019-06-16 16:16:34 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2019-06-16 16:21:54 +0200 |
| commit | 8f551be9356e3b9a8da528ecfd6f96e5ebde7981 (patch) | |
| tree | 2813f22dbaa38a3c6788f563e6d11888ce3e19b0 /nixos/modules/installer/tools/nixos-generate-config.pl | |
| parent | 66add9f141a6612cf9b361fb2c4ce3c54049d61f (diff) | |
| download | nixpkgs-8f551be9356e3b9a8da528ecfd6f96e5ebde7981.tar nixpkgs-8f551be9356e3b9a8da528ecfd6f96e5ebde7981.tar.gz nixpkgs-8f551be9356e3b9a8da528ecfd6f96e5ebde7981.tar.bz2 nixpkgs-8f551be9356e3b9a8da528ecfd6f96e5ebde7981.tar.lz nixpkgs-8f551be9356e3b9a8da528ecfd6f96e5ebde7981.tar.xz nixpkgs-8f551be9356e3b9a8da528ecfd6f96e5ebde7981.tar.zst nixpkgs-8f551be9356e3b9a8da528ecfd6f96e5ebde7981.zip | |
nixos-generate-config: don't emit tmpfs entry for /tmp
Because it most likely comes from the boot.tmpOnTmpfs option in configuration.nix (managed declaratively).
Diffstat (limited to 'nixos/modules/installer/tools/nixos-generate-config.pl')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-generate-config.pl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 4c255ad4786..c09def1fcea 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -441,6 +441,10 @@ EOF } } + # Don't emit tmpfs entry for /tmp, because it most likely comes from the + # boot.tmpOnTmpfs option in configuration.nix (managed declaratively). + next if ($mountPoint eq "/tmp" && $fsType eq "tmpfs"); + # Emit the filesystem. $fileSystems .= <<EOF; fileSystems.\"$mountPoint\" = |