Skip to content

Master fix aptpkg systemd call#56396

Merged
dwoz merged 3 commits into
saltstack:masterfrom
brejoc:master-fix-aptpkg-systemd-call
Apr 12, 2020
Merged

Master fix aptpkg systemd call#56396
dwoz merged 3 commits into
saltstack:masterfrom
brejoc:master-fix-aptpkg-systemd-call

Conversation

@brejoc
Copy link
Copy Markdown
Contributor

@brejoc brejoc commented Mar 17, 2020

What does this PR do?

Sets a --description for the systemd-run command called by aptpkg to avoid long description strings that would cause crashes.
The description comes from __name__ and it would be salt.modules.aptpkg

What issues does this PR fix or reference?

Fixes: aptpkg module causes systemd to crash in Ubuntu 18.04.
When no description is provided to systemd-run, the description is autogenerated from the apt-get command.
If we have a long list of packages the description will be longer than what systemd-run supports and it will crash (systemd/systemd@a7419db)

Setting the description ourselves prevents this even if the systemd doesn't have the fix.

Previous Behavior

See above

New Behavior

Sets the description to salt.modules.aptpkg

Tests written?

Yes

@brejoc brejoc requested a review from a team as a code owner March 17, 2020 15:51
@ghost ghost requested a review from Ch3LL March 17, 2020 15:52
@brejoc
Copy link
Copy Markdown
Contributor Author

brejoc commented Mar 17, 2020

This PR replaces #54077.

cmcmarrow
cmcmarrow previously approved these changes Mar 23, 2020
@brejoc
Copy link
Copy Markdown
Contributor Author

brejoc commented Apr 1, 2020

I've just merged master again. Anything else that needs to be done?

@DmitryKuzmenko DmitryKuzmenko self-assigned this Apr 2, 2020
DmitryKuzmenko
DmitryKuzmenko previously approved these changes Apr 2, 2020
@DmitryKuzmenko
Copy link
Copy Markdown
Contributor

@brejoc you're okay. I've just re-started the test suite. Let's wait for results.

@DmitryKuzmenko
Copy link
Copy Markdown
Contributor

@brejoc could you please resolve merge conflicts?

@brejoc brejoc dismissed stale reviews from DmitryKuzmenko and cmcmarrow via 3294d44 April 8, 2020 07:52
@brejoc
Copy link
Copy Markdown
Contributor Author

brejoc commented Apr 8, 2020

@DmitryKuzmenko PR now complies with black formatting.

@dwoz dwoz merged commit e5035b5 into saltstack:master Apr 12, 2020
@sagetherage sagetherage added the ZRelease-Sodium retired label label May 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ZRelease-Sodium retired label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants