Skip to content

Commit

Permalink
admin: Distribute libvirt-admin.conf
Browse files Browse the repository at this point in the history
Commit 48cd3df introduced configuration
file for libvirt-admin but forgot to distribute it.  Also the change
made to libvirt.conf in commit dbecb87
should've been removed thanks to introduction of separate config file.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
  • Loading branch information
nertpinx committed Dec 1, 2015
1 parent df8192a commit 2340f3e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
1 change: 1 addition & 0 deletions libvirt.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -1569,6 +1569,7 @@ mv $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.so \
rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-admin.so
rm -f $RPM_BUILD_ROOT%{_bindir}/virt-admin
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/virt-admin.1*
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/libvirt-admin.conf

%if %{with_network}
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ moddir = $(libdir)/libvirt/connection-driver
mod_LTLIBRARIES =

confdir = $(sysconfdir)/libvirt
conf_DATA = libvirt.conf
conf_DATA = libvirt.conf libvirt-admin.conf

augeasdir = $(datadir)/augeas/lenses
augeas_DATA =
Expand Down
1 change: 0 additions & 1 deletion src/libvirt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@
# (@uri_default also prevents probing of the hypervisor driver).
#
#uri_default = "qemu:///system"
#uri_default_admin = "libvirtd:///system"

0 comments on commit 2340f3e

Please sign in to comment.