Libguestfs - Apr 2017 - [PATCH v2] builder: Don't hard-code /etc for configuration files.

Use ./configure --sysconfdir setting.
---
 builder/paths.ml           | 2 +-
 mllib/guestfs_config.ml.in | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/builder/paths.ml b/builder/paths.ml
index cbd9d4bd0..d7c4820bf 100644
--- a/builder/paths.ml
+++ b/builder/paths.ml
@@ -35,7 +35,7 @@ let xdg_config_home ()  let xdg_config_dirs ()    let dirs    
try Sys.getenv "XDG_CONFIG_DIRS"
-    with Not_found -> "/etc/xdg" in
+    with Not_found -> Guestfs_config.sysconfdir // "xdg" in
   let dirs = String.nsplit ":" dirs in
   let dirs = List.filter (fun x -> x <> "") dirs in
   List.map (fun x -> x // prog) dirs
diff --git a/mllib/guestfs_config.ml.in b/mllib/guestfs_config.ml.in
index 68dbcbc20..15bebd582 100644
--- a/mllib/guestfs_config.ml.in
+++ b/mllib/guestfs_config.ml.in
@@ -22,5 +22,6 @@ let package_version = "@PACKAGE_VERSION@"
 let package_version_full = "@PACKAGE_VERSION_FULL@"
 let prefix = "@prefix@"
 let datadir = prefix ^ "/share"
+let sysconfdir = "@sysconfdir@"
 let host_cpu = "@host_cpu@"
 let gnupg = "@GNUPG@"
-- 
2.12.0

On Wednesday, 5 April 2017 00:04:21 CEST Richard W.M. Jones
wrote:
> Use ./configure --sysconfdir setting.
> ---
>  builder/paths.ml           | 2 +-
>  mllib/guestfs_config.ml.in | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/builder/paths.ml b/builder/paths.ml
> index cbd9d4bd0..d7c4820bf 100644
> --- a/builder/paths.ml
> +++ b/builder/paths.ml
> @@ -35,7 +35,7 @@ let xdg_config_home () >  let xdg_config_dirs () > 
let dirs >      try Sys.getenv "XDG_CONFIG_DIRS"
> -    with Not_found -> "/etc/xdg" in
> +    with Not_found -> Guestfs_config.sysconfdir // "xdg" in
Hmm... the XDG basedir spec says [1]:

"If $XDG_CONFIG_DIRS is either not set or empty, a value equal to
/etc/xdg should be used."

[1] https://specifications.freedesktop.org/basedir-spec/latest/ar01s03.html

-- 
Pino Toscano

On Thu, Apr 06, 2017 at 11:09:09AM +0200, Pino Toscano
wrote:
> On Wednesday, 5 April 2017 00:04:21 CEST Richard W.M. Jones wrote:
> > Use ./configure --sysconfdir setting.
> > ---
> >  builder/paths.ml           | 2 +-
> >  mllib/guestfs_config.ml.in | 1 +
> >  2 files changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/builder/paths.ml b/builder/paths.ml
> > index cbd9d4bd0..d7c4820bf 100644
> > --- a/builder/paths.ml
> > +++ b/builder/paths.ml
> > @@ -35,7 +35,7 @@ let xdg_config_home () > >  let
xdg_config_dirs () > >    let dirs > >      try Sys.getenv
"XDG_CONFIG_DIRS"
> > -    with Not_found -> "/etc/xdg" in
> > +    with Not_found -> Guestfs_config.sysconfdir // "xdg"
in
> 
> Hmm... the XDG basedir spec says [1]:
> 
> "If $XDG_CONFIG_DIRS is either not set or empty, a value equal to
> /etc/xdg should be used."
OK I'll drop this one.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine.  Supports Linux and Windows.
http://people.redhat.com/~rjones/virt-df/