shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-23 13:57:33 +03:00
Code

mkosi: Only lower device timeout instead of all timeouts

Browse Source 
We only really care about lowering the device timeout so we get to
a shell faster when the root device doesn't appear so let's only
lower that timeout instead of lowering all default timeouts.
This commit is contained in:
Daan De Meyer 2023-05-31 16:19:21 +02:00
parent 6b818cd7e5
commit a47c48cbb2
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/mkosi.yml vendored
View File

@ -87,7 +87,6 @@ jobs:
[Content] [Content]
Environment=CI_BUILD=1 Environment=CI_BUILD=1
DEFAULT_TIMEOUT_SEC=180
SLOW_TESTS=true SLOW_TESTS=true
[Output] [Output]
@ -95,6 +94,8 @@ jobs:
systemd.journald.max_level_console=debug systemd.journald.max_level_console=debug
# udev's debug log output is very verbose, so up it to info in CI. # udev's debug log output is very verbose, so up it to info in CI.
udev.log_level=info udev.log_level=info
# Root device can take a long time to appear, so let's bump the timeout.
systemd.default_device_timeout_sec=180
[Host] [Host]
ExtraSearchPaths=!* ExtraSearchPaths=!*

3
mkosi.conf.d/10-systemd.conf
View File

@ -36,3 +36,6 @@ KernelCommandLineExtra=systemd.crash_shell
systemd.wants=network-online.target systemd.wants=network-online.target
# Make sure we don't load vmw_vmci which messes with virtio vsock. # Make sure we don't load vmw_vmci which messes with virtio vsock.
module_blacklist=vmw_vmci module_blacklist=vmw_vmci
# Lower the default device timeout so we get a shell earlier if the root device does
# not appear for some reason.
systemd.default_device_timeout_sec=10

2
mkosi.presets/00-base/mkosi.build
View File

@ -51,8 +51,6 @@ if [ ! -f "$BUILDDIR"/build.ninja ]; then
CONFIGURE_OPTS=( CONFIGURE_OPTS=(
-D sysvinit-path="$sysvinit_path" -D sysvinit-path="$sysvinit_path"
-D rootprefix="$rootprefix" -D rootprefix="$rootprefix"
-D default-timeout-sec="${DEFAULT_TIMEOUT_SEC:-10}"
-D default-user-timeout-sec="${DEFAULT_TIMEOUT_SEC:-10}"
-D man=false -D man=false
-D translations=false -D translations=false
-D version-tag="${VERSION_TAG}" -D version-tag="${VERSION_TAG}"