-
-
Notifications
You must be signed in to change notification settings - Fork 14.8k
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
systemd: add systemd-importd #70352
systemd: add systemd-importd #70352
Conversation
854033b
to
f5b18e7
Compare
I'll try to have a look at this in the next days. I vaguely remember reasons for not doing what you did there with dbus. I can't remember right now. Hopefully that gets back to me within the next days. |
ping @andir |
What's the effect on closure size? It doesn't seem desirable to me to make systemd dependent on X.org (via libxkbdcommon). |
f5b18e7
to
7d20b67
Compare
How would I find out? Regarding |
|
Ah, with the path to the nix store. I always tried |
Hm, I'd really prefer to avoid a hard dependency on X11 or gpg in the base system. |
7d20b67
to
50aa916
Compare
That seems reasonable. Do we have any other Would you prefer a split derivation (with a var which optionally enables
So this branch may be considered a full fix to #70348 . Btw 2: |
50aa916
to
b7b78a0
Compare
Is it feasible to have those additional binaries in another output without increasing the closure of the That obviously wouldn't help against the build time dependencies. You could probably add the suggested switch and then we have another systemd package that carries all the extra bloat that most/many users do not care about. |
I'm afraid that it might become difficult marrying both parts together. I will look into it though.
You do realize that the current state is shipping not working bloat (at least TL;DR Edit: I started trying to split a
Edit 2: Conclusion
My wish is to have |
c891d8d
to
edf1e49
Compare
Not squashing is fine, the first is good on its own too.
"systemd: etc" is what's not really saying.
It could be something like:
```
systemd: add importd
This will fix the `machinectl import-.*` commands which currently fail with ...
```
|
2ee18b9
to
f6e580c
Compare
Ah I see! Done. |
This doesn't seem to evaluate correctly. |
f6e580c
to
b10cbda
Compare
@GrahamcOfBorg build systemd |
Can you remove the |
Basically a flavour of gnugpg, which solely containts `bin/gnupg`.
Adding `systemd-importd` to the build, so that `machinectl`s `import-.*` may actually do anything. Currently they fail with ``` Failed to transfer image: The name org.freedesktop.import1 was not provided by any .service files ``` as `systemd-importd` is not built. Also registers the regarding dbus api and service in the systemd module.
b10cbda
to
29ac226
Compare
This adds a test downloading an nspawn container via http, and ensures sha256sum verification and gpg signature verification work.
I added a systemd-nspawn test which downloads an nspawn container via http from a local server, and ensures sha256sum verification and gpg signature verification work. PTAL. |
@GrahamcOfBorg test systemd-nspawn |
Ran tests manually on both aarch64-linux and x86_64-linux. |
Added this test to the list in #72828 (it still needs to trickle from staging to master until it can be fixed there). |
Hey, sorry for a stupid question, but how does this work? If I am reading |
I guess things which are not explicitly deactivated are enabled on demand! |
The thing is in this PR you set |
Ok, it ends up being in the dependencies closure somehow, probably as a propagated dep of some other package, huh. |
systemd: add systemd-importd (cherry picked from commit c3566c7)
This reverts commit 602d5f5.
Hi, this caused a regression on our machines.
Additional information: I'm using #46013 to remove polkit from our build which I believe is what resulted in the breaking combination. |
I think this is the same issue as #74626 and not immediately caused by this PR.
|
Motivation for this change
Adding
systemd-importd
to the build, so thatmachinectl
simport-.*
may actually do anything. Currently they fail with
as
systemd-importd
is not built.This potentially will fix #70348
Testing
gnupg
andcurl
in the system environment and workingsudo
sudo
) :You will get a lot of selinux warning (which is perfectly fine if your vm has no se linux). In the end, the image should be verified by checksum and the signature proven by the imported key.
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nix-review --run "nix-review wip"
./result/bin/
)nix path-info -S
before and after)Notify maintainers
cc @