Skip to content

Revert "core: link user keyring to session keyring (#6275)"#6342

Merged
keszybz merged 1 commit intosystemd:masterfrom
poettering:revert-6275
Jul 12, 2017
Merged

Revert "core: link user keyring to session keyring (#6275)"#6342
keszybz merged 1 commit intosystemd:masterfrom
poettering:revert-6275

Conversation

@poettering
Copy link
Copy Markdown
Member

This reverts commit 437a851.

The outcome of this isn't that clear, let's revert this for now, see
discussion on #6286.

(We shouldn't change behaviour again until we figured out the right way how to do all this — which is probably with a service option after all)

This reverts commit 437a851.

The outcome of this isn't that clear, let's revert this for now, see
discussion on systemd#6286.
@poettering poettering added this to the v234 milestone Jul 12, 2017
@keszybz keszybz added the good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed label Jul 12, 2017
@keszybz
Copy link
Copy Markdown
Member

keszybz commented Jul 12, 2017

OK, let's merge this. After all it's a revert, so if it builds is should be no worse then before.

@keszybz keszybz added pid1 and removed good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed labels Jul 12, 2017
@keszybz keszybz merged commit 782c925 into systemd:master Jul 12, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Development

Successfully merging this pull request may close these issues.

2 participants