Move libvirt_qemud to /usr/sbin since it is now "designed
to be executed by hand" ... i.e. we're adding an initscript
for it rather than just having libvirt start it automatically.
Signed-off-by: Mark McLoughlin <markmc(a)redhat.com>
Index: libvirt/qemud/Makefile.am
===================================================================
--- libvirt.orig/qemud/Makefile.am
+++ libvirt/qemud/Makefile.am
@@ -2,7 +2,7 @@
INCLUDES = @LIBXML_CFLAGS@
-libexec_PROGRAMS = libvirt_qemud
+sbin_PROGRAMS = libvirt_qemud
libvirt_qemud_SOURCES = qemud.c internal.h protocol.h \
driver.c driver.h \
Index: libvirt/src/Makefile.am
===================================================================
--- libvirt.orig/src/Makefile.am
+++ libvirt/src/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
INCLUDES = -I$(top_builddir)/include -I@top_srcdir@/include @LIBXML_CFLAGS@
-I@top_srcdir@/qemud \
- -DBINDIR=\""$(libexecdir)"\"
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
+ -DBINDIR=\""$(libexecdir)"\"
-DSBINDIR=\""$(sbindir)"\"
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
-DLOCAL_STATE_DIR=\""$(localstatedir)"\" \
-DGETTEXT_PACKAGE=\"$(PACKAGE)\"
DEPS = libvirt.la
Index: libvirt/src/qemu_internal.c
===================================================================
--- libvirt.orig/src/qemu_internal.c
+++ libvirt/src/qemu_internal.c
@@ -99,8 +99,8 @@ static const char *
qemuFindServerPath(void)
{
static const char *serverPaths[] = {
- BINDIR "/libvirt_qemud",
- BINDIR "/libvirt_qemud_dbg",
+ SBINDIR "/libvirt_qemud",
+ SBINDIR "/libvirt_qemud_dbg",
NULL
};
int i;
--
Show replies by date