Skip to content
Snippets Groups Projects

revise systemd management arrangements

Merged Tomas Krizek requested to merge systemd-revision into master

See !488 (closed) for discussion about the changes.

Merge request reports

Pipeline #33317 passed with warnings

Pipeline passed with warnings for eebce52b on systemd-revision

Test coverage 70.10% (-0.20%) from 1 job
Approval is optional

Merged by Tomas KrizekTomas Krizek 7 years ago (Feb 16, 2018 11:54am UTC)

Merge details

  • Changes merged into master with f3f4408d.
  • Deleted the source branch.

Pipeline #33320 passed with warnings

Pipeline passed with warnings for f3f4408d on master

Test coverage 70.40% (-0.20%) from 1 job

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Tomas Krizek mentioned in merge request !488 (closed)

    mentioned in merge request !488 (closed)

  • Tomas Krizek added 12 commits

    added 12 commits

    • 1ee356fe...6432446f - 3 commits from branch master
    • bbe1cfc2 - More systemd service management cleanup
    • feb01c30 - systemd: remove symlinks
    • 481b8a3b - systemd: drop the preset
    • 1783c5a0 - systemd: no need to include defaults
    • 725157b1 - systemd: clarify dropping Sockets= for non-socket-activated services
    • 780578fb - systemd: drop ReusePort=true, no longer needed
    • 314d8e0b - systemd: remove kresd.service meta-service
    • 3ab4401f - systemd: provide kresd arguments in ExecStart=
    • f6d5f681 - systemd: re-add --forks=1 to ExecStart=

    Compare with previous version

  • mentioned in issue #260 (closed)

  • @dkg Could you please take a look at these changes if we're in agreement? We'd like to finish the systemd modifications so we can release 2.1.0. Thanks!

  • Tomas Krizek added 16 commits

    added 16 commits

    • f6d5f681...817274a4 - 7 commits from branch master
    • 85a7b191 - More systemd service management cleanup
    • a4f27e1f - systemd: remove symlinks
    • 755f44e7 - systemd: drop the preset
    • 7cc94a15 - systemd: no need to include defaults
    • e126b816 - systemd: clarify dropping Sockets= for non-socket-activated services
    • 07c635af - systemd: drop ReusePort=true, no longer needed
    • aaaeac2c - systemd: remove kresd.service meta-service
    • 6ce89e29 - systemd: provide kresd arguments in ExecStart=
    • 228365ab - systemd: re-add --forks=1 to ExecStart=

    Compare with previous version

  • Tomas Krizek added 13 commits

    added 13 commits

    • 228365ab...d5bd6f1a - 4 commits from branch master
    • da078246 - More systemd service management cleanup
    • 73454beb - systemd: remove symlinks
    • 40fef5f2 - systemd: drop the preset
    • e9dc789a - systemd: no need to include defaults
    • cb7887ac - systemd: clarify dropping Sockets= for non-socket-activated services
    • 03c5fd05 - systemd: drop ReusePort=true, no longer needed
    • 2001f9e2 - systemd: remove kresd.service meta-service
    • 0e2644f7 - systemd: provide kresd arguments in ExecStart=
    • 160fcbb1 - systemd: re-add --forks=1 to ExecStart=

    Compare with previous version

  • I've tested the changes in Fedora and EPEL, everything seems to work as expected.

  • @dkg Last call! We will be merging this tomorrow morning.

  • sorry for the delay, looking into it now.

  • it looks good to me, thanks for this work @tkrizek! two small notes:

    • do we really need --forks=1 in ExecStart= for kresd@.service ? i'd really prefer to have a simple command line where possible.
    • do we want to explicitly mention/encourage masking kresd.service on systems where there's the systemd-sysv-generator? maybe that would go in systemd/README.md . As a debian maintainer, explicit suggestions from upstream are useful in helping to justify my packaging decisions :)
  • :thumbsup: --forks=1 shouldn't be needed after 139ea7bc, and that's on master now.

    Edited by Vladimír Čunát
  • Tomas Krizek added 24 commits

    added 24 commits

    • 8e04e9ec...b3e435e8 - 13 commits from branch master
    • 0398a985 - More systemd service management cleanup
    • 8fbc5ee3 - systemd: remove symlinks
    • de25e937 - systemd: drop the preset
    • 6e3c7abc - systemd: no need to include defaults
    • 26918db9 - systemd: clarify dropping Sockets= for non-socket-activated services
    • cd23b590 - systemd: drop ReusePort=true, no longer needed
    • 1f9aa9a6 - systemd: remove kresd.service meta-service
    • 24711da7 - systemd: provide kresd arguments in ExecStart=
    • 75387d4b - systemd: link to kresd.systemd(7) in unit files and doc
    • 6806f7dd - systemd: compatibility drop-in for kresd@.service
    • d42ab16e - systemd: update README

    Compare with previous version

    • --forks=1 is necessary, but only for systemd<227. Otherwise, the service attempts to start in interactive mode. To keep the ExecStart= simple, I've moved it to the compatibility drop-in.
    • I've added a note about masking kresd.service to README

    Thanks for the feedback!

  • Tomas Krizek added 2 commits

    added 2 commits

    Compare with previous version

  • merged

  • Tomas Krizek mentioned in commit f3f4408d

    mentioned in commit f3f4408d

  • mentioned in commit dkg/resolver@de007eeb

Please register or sign in to reply
Loading