From 819c0dcbf510dab8044e77e98e7593b384ad908c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 9 Jun 2022 20:33:29 +0200 Subject: [PATCH] meson: use status-unit-format-default=name in developer mode I think developers are particularly unlikely to find the descriptions useful, and would benefit from being able to copy&paste unit names. Let's make this choice automatically. --- meson.build | 3 +++ meson_options.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 630f84d702..d6391d45a2 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) diff --git a/meson_options.txt b/meson_options.txt index 3bb25c6f76..267c829368 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')