meson: improve keyfile_default

diff --git a/meson.build b/meson.build
index 6db05c75f39a9d5a0eca80b6b83738be43ae8273..556b6f27d079cafc16abd1ac3611ca5cd0a5db09 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -51,16 +51,15 @@ systemd_tmpfiles_dir = ''
 
 ## Trust anchors
 managed_ta = get_option('managed_ta').enabled()
-keyfile_default = get_option('keyfile_default')
-if keyfile_default == ''
-  keyfile_default = join_paths(etc_dir, 'root.keys')
+keyfile_default = join_paths(etc_dir, get_option('keyfile_default'))
+if keyfile_default == join_paths(etc_dir, 'root.keys')
   install_root_keys = true
   managed_ta = managed_ta or get_option('managed_ta').auto()
 else
   install_root_keys = false
   if managed_ta
-    warning('Using managed_ta along with keyfile_default. Ensure '
-           + 'keyfile_default directory will be writable by kresd.')
+    warning('Using managed_ta along with non-standard keyfile_default. ' +
+           'Ensure keyfile_default directory will be writable by kresd.')
   endif
 endif
 

diff --git a/meson_options.txt b/meson_options.txt
index 587d5eb1293966e394aaddbe19735580d8bcca90..76d0fa6e261779ec40de6f4b5bf1e0833641ba8b 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -2,7 +2,8 @@
 option(
   'keyfile_default',
   type: 'string',
-  description: 'built-in default path to DNSSEC trust anchors file',
+  value: 'root.keys',
+  description: 'built-in path to DNSSEC trust anchors file',
 )
 
 option(