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: 01c61f3923bb
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a3a02d6cd416
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 26, 2020

  1. Revert "nixos-container: use systemd-run instead of nsenter" 

    This reverts commit 7cb100b.

This appears to break at least the `container`-backend of `nixops`: when
running `switch-to-configuration` within `nixos-container run`, the
running `systemd`-instance gets reloaded which appears to kill the
`systemd-run` command and causes `nixos-container run` to hang.

The full issue is reported in the original PR[1].

[1] #67332 (comment)
    @Ma27
    Ma27 committed Mar 26, 2020
    Copy the full SHA
    7f1ba60 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #83392 from Ma27/nixos-container-nsenter-20.03 

    Revert "nixos-container: use systemd-run instead of nsenter"
    @worldofpeace
    worldofpeace committed Mar 26, 2020
    Copy the full SHA
    a3a02d6 View commit details
    Browse the repository at this point in the history