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
base: f23c110692c6
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 6723d59ae929
Choose a head ref
  • 4 commits
  • 1 file changed
  • 1 contributor

Commits on May 30, 2019

  1. chrootenv: make stackable 

    The problem with stacking chrootenv before was that CLONE_NEWUSER cannot
be used when a child uses chroot. So instead of that we use pivot_root
which replaces root in the whole namespace. This requires our new root
to be an actual fs so we mount tmpfs.
    @abbradar
    abbradar committed May 30, 2019
    Copy the full SHA
    e0d3bc2 View commit details
    Browse the repository at this point in the history

  2. chrootenv: small improvements 

    * Remove unused argument from pivot_root;
* Factor out tmpdir creation into a separate function;
* Remove unused fstype from bind mount;
* Use unlink instead of a treewalk to remove empty temporary directory.
    @abbradar
    abbradar committed May 30, 2019
    Copy the full SHA
    7664ffb View commit details
    Browse the repository at this point in the history

  3. chrootenv: propagate nested chrootenv /host 

    To avoid symlink loops to /host in nested chrootenvs we need to remove
one level of indirection. This is also what's generally expected of
/host contents.
    @abbradar
    abbradar committed May 30, 2019
    Copy the full SHA
    06f27dc View commit details
    Browse the repository at this point in the history

  4. Merge pull request #61740 from abbradar/nested-chrootenv 

    Support nested user chrootenv environments
    @abbradar
    abbradar committed May 30, 2019
    Copy the full SHA
    6723d59 View commit details
    Browse the repository at this point in the history