mirror of
https://github.com/systemd/systemd
synced 2024-07-21 18:24:38 +00:00
e4c7b5f517
Config options are -Ddefault-timeout-sec= and -Ddefault-user-timeout-sec=. Existing -Dupdate-helper-user-timeout= is renamed to -Dupdate-helper-user-timeout-sec= for consistency. All three options take an integer value in seconds. The renaming and type-change of the option is a small compat break, but it's just at compile time and result in a clear error message. I also doubt that anyone was actually using the option. This commit separates the user manager timeouts, but keeps them unchanged at 90 s. The timeout for the user manager is set to 4/3*user-timeout, which means that it is still 120 s. Fedora wants to experiment with lower timeouts, but doing this via a patch would be annoying and more work than necessary. Let's make this easy to configure.
22 lines
1.1 KiB
XML
22 lines
1.1 KiB
XML
<?xml version="1.0" encoding="utf-8" ?>
|
|
<!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
|
|
<!ENTITY MOUNT_PATH "{{MOUNT_PATH}}">
|
|
<!ENTITY UMOUNT_PATH "{{UMOUNT_PATH}}">
|
|
<!ENTITY SYSTEM_GENERATOR_DIR "{{SYSTEM_GENERATOR_DIR}}">
|
|
<!ENTITY USER_GENERATOR_DIR "{{USER_GENERATOR_DIR}}">
|
|
<!ENTITY SYSTEM_ENV_GENERATOR_DIR "{{SYSTEM_ENV_GENERATOR_DIR}}">
|
|
<!ENTITY USER_ENV_GENERATOR_DIR "{{USER_ENV_GENERATOR_DIR}}">
|
|
<!ENTITY CERTIFICATE_ROOT "{{CERTIFICATE_ROOT}}">
|
|
<!ENTITY FALLBACK_HOSTNAME "{{FALLBACK_HOSTNAME}}">
|
|
<!ENTITY MEMORY_ACCOUNTING_DEFAULT "{{ 'yes' if MEMORY_ACCOUNTING_DEFAULT else 'no' }}">
|
|
<!ENTITY KILL_USER_PROCESSES "{{ 'yes' if KILL_USER_PROCESSES else 'no' }}">
|
|
<!ENTITY DEBUGTTY "{{DEBUGTTY}}">
|
|
<!ENTITY RC_LOCAL_PATH "{{RC_LOCAL_PATH}}">
|
|
<!ENTITY HIGH_RLIMIT_NOFILE "{{HIGH_RLIMIT_NOFILE}}">
|
|
<!ENTITY DEFAULT_DNSSEC_MODE "{{DEFAULT_DNSSEC_MODE_STR}}">
|
|
<!ENTITY DEFAULT_DNS_OVER_TLS_MODE "{{DEFAULT_DNS_OVER_TLS_MODE_STR}}">
|
|
<!ENTITY DEFAULT_TIMEOUT "{{DEFAULT_TIMEOUT_SEC}} s">
|
|
<!ENTITY DEFAULT_USER_TIMEOUT "{{DEFAULT_USER_TIMEOUT_SEC}} s">
|
|
<!ENTITY fedora_latest_version "36">
|
|
<!ENTITY fedora_cloud_release "1.5">
|