Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

runc: add wrapper for systemd #104545

Merged
merged 1 commit into from Nov 26, 2020
Merged

runc: add wrapper for systemd #104545

merged 1 commit into from Nov 26, 2020

Conversation

zowoq
Copy link
Contributor

@zowoq zowoq commented Nov 22, 2020

Fixes cgroupsv2 + rootless + runc but nixosTests.podman still fails for some reason.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

cc @flokli

Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@flokli
Copy link
Contributor

flokli commented Nov 22, 2020

Sorry, I don't understand what this PR is supposed to fix. Why does it need systemd in $PATH?

Copy link
Contributor

@flokli flokli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only occurence to systemctl seems to be in libcontainer/cgroups/systemd/user.go, which should better be taken from /run/current-system/systemd/bin instead of ${pkgs.systemd}/bin, for the same reasons as #88492.

@zowoq
Copy link
Contributor Author

zowoq commented Nov 22, 2020

/run/current-system/systemd/bin

How does that work on non-nixos?

@flokli
Copy link
Contributor

flokli commented Nov 22, 2020

/run/current-system/systemd/bin

How does that work on non-nixos?

I meant to wrap the binary to add this path to $PATH. Other distros probably already have their running systemctl in $PATH.

But first, what is your PR trying to fix? Looking back at libcontainer/cgroups/systemd/user.go, shelling out to systemctl is a "last resort" mechanism, if DBUS_SESSION_BUS_ADDRESS and ${XDG_RUNTIME_DIR}/bus both can't be found.

@zowoq
Copy link
Contributor Author

zowoq commented Nov 22, 2020

But first, what is your PR trying to fix?

could not execute `busctl --user --no-pager status`

@zowoq zowoq requested a review from flokli November 22, 2020 11:03
@ofborg ofborg bot requested a review from saschagrunert November 22, 2020 11:22
@flokli
Copy link
Contributor

flokli commented Nov 22, 2020

Can you also add procps to the wrapper? That seems to be required by runc ps

for cgroupsv2 it needs `busctl` and `systemctl` in its PATH.
@flokli flokli merged commit 1cdbdc3 into NixOS:master Nov 26, 2020
@zowoq zowoq deleted the runc branch November 26, 2020 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants