Merge pull request #297 from igaw/fix-stringify-hostnqn

fabrics: Correctly stringify default hostnqn and hostid paths
linux-nvme · Mar 18, 2022 · 057c801 · 057c801
2 parents 121b14f + 0e5e1e3
commit 057c801
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/meson.build b/meson.build
@@ -36,7 +36,7 @@ pkgconfiglibdir = get_option('pkgconfiglibdir') == '' ? join_paths(libdir, 'pkgc
 ################################################################################
 conf = configuration_data()
 
-conf.set('SYSCONFDIR', sysconfdir)
+conf.set('SYSCONFDIR', '"@0@"'.format(sysconfdir))
 
 # Check for libuuid availability
 libuuid_dep = dependency('uuid', required: true)

diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c
@@ -41,8 +41,8 @@
 #define NVMF_HOSTID_SIZE	37
 #define UUID_SIZE		37  /* 1b4e28ba-2fa1-11d2-883f-0016d3cca427 + \0 */
 
-#define NVMF_HOSTNQN_FILE	"SYSCONFDIR/nvme/hostnqn"
-#define NVMF_HOSTID_FILE	"SYSCONFDIR/nvme/hostid"
+#define NVMF_HOSTNQN_FILE	SYSCONFDIR "/nvme/hostnqn"
+#define NVMF_HOSTID_FILE	SYSCONFDIR "/nvme/hostid"
 
 const char *nvmf_dev = "/dev/nvme-fabrics";