Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4f65275babc5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bfc68f778a7a
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 16, 2019

  1. 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).

(cherry picked from commit 8f551be)
    @bjornfor
    bjornfor committed Jun 16, 2019
    Copy the full SHA
    bfc68f7 View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 nixos/modules/installer/tools/nixos-generate-config.pl
4 changes: 4 additions & 0 deletions nixos/modules/installer/tools/nixos-generate-config.pl
View file
Original file line number Diff line number Diff line change
@@ -441,6 +441,10 @@ sub in {
}
}

# 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\" =