diff options
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | meson_options.txt | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 62c605129f..e3b68a8dcc 100644 --- a/meson.build +++ b/meson.build @@ -226,6 +226,9 @@ endif memory_accounting_default = get_option('memory-accounting-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('BOOTLIBDIR', bootlibdir) @@ -4191,6 +4194,7 @@ summary({ 'default net.naming-scheme value' : default_net_naming_scheme, 'default KillUserProcesses value' : kill_user_processes, 'default locale' : default_locale, + 'default status unit format' : status_unit_format_default, 'default user $PATH' : default_user_path != '' ? default_user_path : '(same as system services)', 'systemd service watchdog' : service_watchdog == '' ? 'disabled' : service_watchdog, diff --git a/meson_options.txt b/meson_options.txt index 3a1d7ce0ec..b42ae0d90b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -214,7 +214,7 @@ option('extra-net-naming-schemes', type : 'string', option('default-net-naming-scheme', type : 'string', value : 'latest', description : 'default net.naming-scheme= value') 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') option('time-epoch', type : 'integer', value : '-1', description : 'time epoch for time clients') |