Page MenuHomeSolus

systemd: Provide conf.d/ vendor-default timeout values
AbandonedPublic

Authored by ermo on Aug 4 2023, 10:54 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Aug 31, 12:43 AM
Unknown Object (File)
Thu, Aug 29, 10:46 PM
Unknown Object (File)
Tue, Aug 27, 12:15 PM
Unknown Object (File)
Tue, Aug 27, 1:48 AM
Unknown Object (File)
Mon, Aug 26, 11:14 AM
Unknown Object (File)
Sun, Aug 25, 9:51 AM
Unknown Object (File)
Fri, Aug 23, 10:58 PM
Unknown Object (File)
Fri, Aug 23, 8:52 PM

Details

Reviewers
algent
Group Reviewers
Triage Team
Summary

Revert "systemd: Fix timeouts mounting swap partitions and other devices"

This reverts commit 3e2f0a3405d13421acd9780f1a1d3678d0a672bb.

Instead, it uses systemd's conf.d/ feature to achieve this, rather than having to carry a bunch of gnarly patches.

Uses 30s for start timeouts and 10s for stop timeouts.

Also changes to use a compile-time default of 30s in timeouts (instead of the default of 5s).

Signed-off-by: Rune Morling <ermo@serpentos.com>

Test Plan

Checked that the timeout values are set in /usr/lib/systemd/system.conf.d/ and /usr/lib/systemd/user.conf.d/ vendor dirs.

Diff Detail

Repository
R2999 systemd
Branch
master
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 5368
Build 5368: arc lint + arc unit

Event Timeline

ermo requested review of this revision.Aug 4 2023, 10:54 AM

Add DefaultDeviceTimeoutSec=30s to defaults

@ReillyBrogan :

If you decide to land this, be aware that it _deletes_ the secure boot certificate (/usr/lib/systemd/boot/solus-mok.cer) , so you will likely want to re-add that?

(fixed in latest revision)

algent requested changes to this revision.Aug 4 2023, 12:27 PM
algent added a subscriber: algent.

You missed a bump.

This revision now requires changes to proceed.Aug 4 2023, 12:27 PM

Add secure boot cruft and bump the package properly.

  • Re-add default timeout of 30s per request
  • Fix type in conf.d/ file
ermo retitled this revision from Revert "systemd: Fix timeouts mounting swap partitions and other devices" to systemd: Provide conf.d/ vendor-default timeout values.
ermo edited the summary of this revision. (Show Details)

Noop to satisfy arc diff.

ermo edited the summary of this revision. (Show Details)

Edit commit to have longer lines

ermo edited the summary of this revision. (Show Details)

Add note on the 30s compile-time default.