Richard W.M. Jones
2014-Mar-02 12:43 UTC
Re: [Libguestfs] [PATCH 3/8] builder: add functions to read XDG_CONFIG_DIRS and XDG_CONFIG_PATH
On Tue, Feb 25, 2014 at 05:29:08PM +0100, Pino Toscano wrote:> +let xdg_config_dirs ~prog > + let dirs > + try Sys.getenv "XDG_CONFIG_DIRS" > + with Not_found -> "/etc/xdg" inThis seems to put the virt-builder config files into /etc/xdg/virt-builder which is kind of annoying. Can we move them to a regular default location (/etc/virt-builder)? I have patched this in the Fedora package for now. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://people.redhat.com/~rjones/virt-top
Pino Toscano
2014-Mar-03 15:31 UTC
[Libguestfs] [PATCH] builder: install a $sysconfdir/virt-builder -> xdg-virt-builder symlink
This way "virt-builder" appears directly in the sysconfdir. --- builder/Makefile.am | 3 +++ configure.ac | 1 + 2 files changed, 4 insertions(+) diff --git a/builder/Makefile.am b/builder/Makefile.am index a539e91..b3de967 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -246,6 +246,9 @@ DISTCLEANFILES = .depend repoconfdir = $(sysconfdir)/xdg/virt-builder/repos.d repoconf_DATA = libguestfs.conf libguestfs.gpg +install-exec-hook: + $(LN_S) xdg/virt-builder $(DESTDIR)$(sysconfdir)/virt-builder + # Build a small C index validator program. bin_PROGRAMS = virt-index-validate diff --git a/configure.ac b/configure.ac index 8ea2620..da7caa7 100644 --- a/configure.ac +++ b/configure.ac @@ -116,6 +116,7 @@ gl_EARLY gl_INIT AC_PROG_LIBTOOL +AC_PROG_LN_S # Define $(SED). m4_ifdef([AC_PROG_SED],[ -- 1.8.3.1
Richard W.M. Jones
2014-Mar-03 15:55 UTC
Re: [Libguestfs] [PATCH] builder: install a $sysconfdir/virt-builder -> xdg-virt-builder symlink
On Mon, Mar 03, 2014 at 04:31:47PM +0100, Pino Toscano wrote:> This way "virt-builder" appears directly in the sysconfdir. > --- > builder/Makefile.am | 3 +++ > configure.ac | 1 + > 2 files changed, 4 insertions(+) > > diff --git a/builder/Makefile.am b/builder/Makefile.am > index a539e91..b3de967 100644 > --- a/builder/Makefile.am > +++ b/builder/Makefile.am > @@ -246,6 +246,9 @@ DISTCLEANFILES = .depend > repoconfdir = $(sysconfdir)/xdg/virt-builder/repos.d > repoconf_DATA = libguestfs.conf libguestfs.gpg > > +install-exec-hook: > + $(LN_S) xdg/virt-builder $(DESTDIR)$(sysconfdir)/virt-builder > + > # Build a small C index validator program. > bin_PROGRAMS = virt-index-validate > > diff --git a/configure.ac b/configure.ac > index 8ea2620..da7caa7 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -116,6 +116,7 @@ gl_EARLY > gl_INIT > > AC_PROG_LIBTOOL > +AC_PROG_LN_S > > # Define $(SED). > m4_ifdef([AC_PROG_SED],[ > -- > 1.8.3.1ACK. I guess we should use $(LN_S) a few other places? $ git grep -- 'ln -s'|wc -l 28 Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into KVM guests. http://libguestfs.org/virt-v2v