Rename the daemon to libvirtd

diff --git a/ChangeLog b/ChangeLog
index 8af14abe1533e43bd7f0335d6944dccc3a22c0b7..87a635e1d10511f408841e0c866fa748451a14be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 26 19:04:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+       * qemud/libvirtd.init.in, qemud/Makefile.am, libvirt.spec.in
+       Rename the daemon from libvirt_qemud to libvirtd
+
 Tue Jun 26 19:02:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
 
        * qemud/libvirtd.in, qemud/libvirtd.init.in, qemud/Makefile.am

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 29accf943d2d56c9fea262af21d47382832a8c56..9b09a90df2d91b5a017a003650c9fd1aa143de4d 100644 (file)
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -135,7 +135,7 @@ fi
 %dir %{_localstatedir}/lib/libvirt/
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
-%attr(0755, root, root) %{_sbindir}/libvirt_qemud
+%attr(0755, root, root) %{_sbindir}/libvirtd
 %doc docs/libvirt.rng
 
 %files devel

diff --git a/qemud/Makefile.am b/qemud/Makefile.am
index 7625a98e233cc3fe5aa421d2b3e86bac57050a4d..53c2815faf2c6613f815354a161c91589b77730e 100644 (file)
--- a/qemud/Makefile.am
+++ b/qemud/Makefile.am
@@ -3,9 +3,9 @@
 INCLUDES = @LIBXML_CFLAGS@
 UUID=$(shell uuidgen)
 
-sbin_PROGRAMS = libvirt_qemud
+sbin_PROGRAMS = libvirtd
 
-libvirt_qemud_SOURCES = \
+libvirtd_SOURCES = \
                qemud.c internal.h \
                 driver.c driver.h \
                 dispatch.c dispatch.h \
@@ -20,7 +20,7 @@ libvirt_qemud_SOURCES = \
                 ../src/virterror.c \
                 event.c event.h
 #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L
-libvirt_qemud_CFLAGS = \
+libvirtd_CFLAGS = \
         -I$(top_srcdir)/include -I$(top_builddir)/include $(LIBXML_CFLAGS) \
         $(WARN_CFLAGS) -DLOCAL_STATE_DIR="\"$(localstatedir)\"" \
         -DSYSCONF_DIR="\"$(sysconfdir)\"" \
@@ -28,9 +28,9 @@ libvirt_qemud_CFLAGS = \
        -DREMOTE_PID_FILE="\"$(REMOTE_PID_FILE)\"" \
         -DGETTEXT_PACKAGE=\"$(PACKAGE)\"
 
-libvirt_qemud_LDFLAGS = $(WARN_CFLAGS) $(LIBXML_LIBS)
-libvirt_qemud_DEPENDENCIES = ../src/libvirt.la
-libvirt_qemud_LDADD = ../src/libvirt.la
+libvirtd_LDFLAGS = $(WARN_CFLAGS) $(LIBXML_LIBS)
+libvirtd_DEPENDENCIES = ../src/libvirt.la
+libvirtd_LDADD = ../src/libvirt.la
 
 install-data-local: install-init
        mkdir -p $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart

diff --git a/qemud/libvirtd.init.in b/qemud/libvirtd.init.in
index 27bf1b77aa1aeac59bb075fdfa1ec9ae883ccb9b..7522f9300870003d31320ff8fa5fc88d06e82257 100644 (file)
--- a/qemud/libvirtd.init.in
+++ b/qemud/libvirtd.init.in
@@ -12,13 +12,13 @@
 #
 
 # Sanity checks.
-[ -x @sbindir@/libvirt_qemud ] || exit 0
+[ -x @sbindir@/libvirtd ] || exit 0
 
 # Source function library.
 . @sysconfdir@/rc.d/init.d/functions
 
 SERVICE=libvirtd
-PROCESS=libvirt_qemud
+PROCESS=libvirtd
 
 
 RETVAL=0