mirror of
https://github.com/systemd/systemd
synced 2024-07-21 18:24:38 +00:00
Merge pull request #23683 from keszybz/status-format
Default to default-status-unit-format=name in developer mode
This commit is contained in:
commit
e538d59367
|
@ -226,6 +226,9 @@ endif
|
||||||
|
|
||||||
memory_accounting_default = get_option('memory-accounting-default')
|
memory_accounting_default = get_option('memory-accounting-default')
|
||||||
status_unit_format_default = get_option('status-unit-format-default')
|
status_unit_format_default = get_option('status-unit-format-default')
|
||||||
|
if status_unit_format_default == 'auto'
|
||||||
|
status_unit_format_default = conf.get('BUILD_MODE_DEVELOPER') == 1 ? 'name' : 'description'
|
||||||
|
endif
|
||||||
|
|
||||||
conf.set_quoted('BINFMT_DIR', binfmtdir)
|
conf.set_quoted('BINFMT_DIR', binfmtdir)
|
||||||
conf.set_quoted('BOOTLIBDIR', bootlibdir)
|
conf.set_quoted('BOOTLIBDIR', bootlibdir)
|
||||||
|
@ -4191,6 +4194,7 @@ summary({
|
||||||
'default net.naming-scheme value' : default_net_naming_scheme,
|
'default net.naming-scheme value' : default_net_naming_scheme,
|
||||||
'default KillUserProcesses value' : kill_user_processes,
|
'default KillUserProcesses value' : kill_user_processes,
|
||||||
'default locale' : default_locale,
|
'default locale' : default_locale,
|
||||||
|
'default status unit format' : status_unit_format_default,
|
||||||
'default user $PATH' :
|
'default user $PATH' :
|
||||||
default_user_path != '' ? default_user_path : '(same as system services)',
|
default_user_path != '' ? default_user_path : '(same as system services)',
|
||||||
'systemd service watchdog' : service_watchdog == '' ? 'disabled' : service_watchdog,
|
'systemd service watchdog' : service_watchdog == '' ? 'disabled' : service_watchdog,
|
||||||
|
|
|
@ -214,7 +214,7 @@ option('extra-net-naming-schemes', type : 'string',
|
||||||
option('default-net-naming-scheme', type : 'string', value : 'latest',
|
option('default-net-naming-scheme', type : 'string', value : 'latest',
|
||||||
description : 'default net.naming-scheme= value')
|
description : 'default net.naming-scheme= value')
|
||||||
option('status-unit-format-default', type : 'combo',
|
option('status-unit-format-default', type : 'combo',
|
||||||
choices : ['description', 'name', 'combined'],
|
choices : ['auto', 'description', 'name', 'combined'],
|
||||||
description : 'use unit name or description in messages by default')
|
description : 'use unit name or description in messages by default')
|
||||||
option('time-epoch', type : 'integer', value : '-1',
|
option('time-epoch', type : 'integer', value : '-1',
|
||||||
description : 'time epoch for time clients')
|
description : 'time epoch for time clients')
|
||||||
|
|
Loading…
Reference in a new issue