meson: introduce unquoted variable for path

Kristina Hanicova · Kristina Hanicova · commit 91154e15f16d · 2026-03-26T13:55:20.000+01:00
We need two different variables for the path, one quoted for
config.h and the other unquoted for cryptsetup.conf.

Fixes: #980.
diff --git a/meson.build b/meson.build
@@ -67,6 +67,7 @@ foreach default_option : (default_int_options)
 endforeach
 
 conf.set('DEFAULT_LUKS2_LOCK_DIR_PERMS', get_option('default-luks2-lock-dir-perms'))
+conf.set('DEFAULT_LUKS2_LOCK_PATH_UNQUOTED', get_option('default-luks2-lock-path'))
 
 sanitizer = get_option('b_sanitize')
 sanitizer_enabled = sanitizer != '' and sanitizer != 'none'
diff --git a/scripts/cryptsetup.conf.in b/scripts/cryptsetup.conf.in
@@ -1 +1 @@
-d @DEFAULT_LUKS2_LOCK_PATH@ @DEFAULT_LUKS2_LOCK_DIR_PERMS@ root root -
+d @DEFAULT_LUKS2_LOCK_PATH_UNQUOTED@ @DEFAULT_LUKS2_LOCK_DIR_PERMS@ root root -

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-d @DEFAULT_LUKS2_LOCK_PATH@ @DEFAULT_LUKS2_LOCK_DIR_PERMS@ root root -`
	`1`	`+d @DEFAULT_LUKS2_LOCK_PATH_UNQUOTED@ @DEFAULT_LUKS2_LOCK_DIR_PERMS@ root root -`