summaryrefslogtreecommitdiffstats
path: root/nixos
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2019-06-16 16:16:34 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2019-06-16 16:21:54 +0200
commit8f551be9356e3b9a8da528ecfd6f96e5ebde7981 (patch)
tree2813f22dbaa38a3c6788f563e6d11888ce3e19b0 /nixos
parent66add9f141a6612cf9b361fb2c4ce3c54049d61f (diff)
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')
-rw-r--r--nixos/modules/installer/tools/nixos-generate-config.pl4
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 4c255ad47869..c09def1fceae 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\" =