Commit b5d0d175 authored by Andrea Bolognani's avatar Andrea Bolognani

Install daemon under @sbindir@

The libvirt-dbus daemon is not supposed to be invoked
explicitly by the user, but rather to be spawned on-demand
by the D-Bus daemon: as such, @sbindir@ is a more suitable
location in which to install it.
Signed-off-by: 's avatarAndrea Bolognani <abologna@redhat.com>
Reviewed-by: Pavel Hrdina's avatarPavel Hrdina <phrdina@redhat.com>
parent 6f626690
......@@ -63,12 +63,12 @@ CLEANFILES = \
session/org.libvirt.service: session/org.libvirt.service.in
$(AM_V_GEN)$(MKDIR_P) session && \
sed -e 's|[@]bindir[@]|$(bindir)|g' < $< > $@-t && \
sed -e 's|[@]sbindir[@]|$(sbindir)|g' < $< > $@-t && \
mv $@-t $@
system/org.libvirt.service: system/org.libvirt.service.in
$(AM_V_GEN)$(MKDIR_P) system && \
sed -e 's|[@]bindir[@]|$(bindir)|g' \
sed -e 's|[@]sbindir[@]|$(sbindir)|g' \
-e 's|[@]SYSTEM_USER[@]|$(SYSTEM_USER)|' \
< $< > $@-t && mv $@-t $@
......
[D-BUS Service]
Name=org.libvirt
Exec=@bindir@/libvirt-dbus --session
Exec=@sbindir@/libvirt-dbus --session
[D-BUS Service]
Name=org.libvirt
Exec=@bindir@/libvirt-dbus --system
Exec=@sbindir@/libvirt-dbus --system
User=@SYSTEM_USER@
......@@ -51,7 +51,7 @@ exit 0
%files
%doc README.md HACKING.md AUTHORS NEWS
%license COPYING
%{_bindir}/libvirt-dbus
%{_sbindir}/libvirt-dbus
%{_datadir}/dbus-1/services/org.libvirt.service
%{_datadir}/dbus-1/system-services/org.libvirt.service
%{_datadir}/dbus-1/system.d/org.libvirt.conf
......
......@@ -28,7 +28,7 @@ libutil_la_SOURCES = \
util.h \
$(NULL)
bin_PROGRAMS = \
sbin_PROGRAMS = \
libvirt-dbus \
$(NULL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment